diff options
| author | Michael Adam <obnox@samba.org> | 2014-12-22 11:27:40 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-01-08 23:38:07 +0100 |
| commit | ffff95d421e3ca7fa31ec668a2e8fc7fdaee05df (patch) | |
| tree | f3835e6bdf5fec908feffc8491c8ee3a779c23cb /buildtools | |
| parent | d7bd51a79d0784d3db809c0c5e82193f79799dc3 (diff) | |
| download | samba-ffff95d421e3ca7fa31ec668a2e8fc7fdaee05df.tar.gz | |
Revert "waf: added suncc_wrap"
This reverts commit 65743f932b511db009655847e77288c95c0aa525.
Conflicts:
buildtools/wafsamba/samba_optimisation.py
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_optimisation.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py index 1e7a57fb0b5..8bd4dd617ee 100644 --- a/buildtools/wafsamba/samba_optimisation.py +++ b/buildtools/wafsamba/samba_optimisation.py @@ -9,7 +9,7 @@ import os import Build, Utils, Node from TaskGen import feature, after, before -import preproc, Task +import preproc @feature('cc', 'cxx') @after('apply_type_vars', 'apply_lib_vars', 'apply_core') @@ -151,23 +151,6 @@ 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']) - - - def hash_env_vars(self, env, vars_lst): idx = str(id(env)) + str(vars_lst) try: |