sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Revert "waf: added suncc_wrap"

Browse Source 
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>
This commit is contained in:
Michael Adam 2014-12-22 11:27:40 +01:00 committed by Jeremy Allison
parent d7bd51a79d
commit ffff95d421
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
buildtools/wafsamba/samba_optimisation.py
View File

@ -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: