From 65743f932b511db009655847e77288c95c0aa525 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 29 Oct 2010 11:49:31 +1100 Subject: [PATCH] waf: added suncc_wrap this should solve a problem with creating alias modules with Sun CC. Thanks to Matthieu for the idea, and Thomas for the waf code --- buildtools/wafsamba/samba_optimisation.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py index 1c3478c2a448..ad0534834f3a 100644 --- a/buildtools/wafsamba/samba_optimisation.py +++ b/buildtools/wafsamba/samba_optimisation.py @@ -7,7 +7,7 @@ # overall this makes some build tasks quite a bit faster from TaskGen import feature, after -import preproc +import preproc, Task @feature('cc', 'cxx') @after('apply_type_vars', 'apply_lib_vars', 'apply_core') @@ -148,3 +148,18 @@ Task.TaskBase.hash_constraints = hash_constraints # return task + +def suncc_wrap(cls): + '''work around a problem with cc on solaris not handling module aliases + which have empty libs''' + if getattr(cls, 'solaris_wrap', False): + return + cls.solaris_wrap = True + oldrun = cls.run + def run(self): + if self.env.CC_NAME == "sun" and not self.inputs: + self.env = self.env.copy() + self.env.append_value('LINKFLAGS', '-') + return oldrun(self) + cls.run = run +suncc_wrap(Task.TaskBase.classes['cc_link']) -- 2.34.1