From: Michael Adam <obnox@samba.org>
Date: Mon, 22 Dec 2014 10:27:40 +0000 (+0100)
Subject: Revert "waf: added suncc_wrap"
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=f1b187f0135c9c71126020dacc71983c21ea2c38

Revert "waf: added suncc_wrap"

This reverts commit 65743f932b511db009655847e77288c95c0aa525.

Conflicts:
	buildtools/wafsamba/samba_optimisation.py
---

diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index 589e1acd4eb..fac1d3337bf 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: