SQ2

diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index f84a24d10e53b63edfdcf32a3547accdf3e96bff..589e1acd4eb04e770ce09bbc4ba16a53184a61c6 100644 (file)
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -90,20 +90,6 @@ def apply_obj_vars_cc(self):
     for i in env['CPPPATH']:
         app('_CCINCFLAGS', cpppath_st % i)
 
-@feature('cc')
-@before('apply_incpaths', 'apply_obj_vars_cc')
-def samba_stash_cppflags(self):
-    """Fix broken waf ordering of CPPFLAGS"""
-    self.env['SAVED_CPPFLAGS'] = self.env['CPPFLAGS']
-    self.env['CPPFLAGS'] = []
-
-@feature('cc')
-@after('apply_incpaths', 'apply_obj_vars_cc')
-def samba_pop_cppflags(self):
-    # append stashed user CPPFLAGS after our internally computed flags
-    app('_CCINCFLAGS', env['SAVED_CPPFLAGS'])
-    env['SAVED_CPPFLAGS'] = []
-
 import Node, Environment
 
 def vari(self):
@@ -346,14 +332,30 @@ def samba_before_apply_obj_vars(self):
         if is_standard_libpath(v, i):
             v['LIBPATH'].remove(i)
 
+@feature('cc')
+@before('apply_incpaths', 'apply_obj_vars_cc')
+def samba_stash_cppflags(self):
+    """Fix broken waf ordering of CPPFLAGS"""
+
+    self.env.SAVED_CPPFLAGS = self.env.CPPFLAGS
+    self.env.CPPFLAGS = []
+
+@feature('cc')
+@after('apply_incpaths', 'apply_obj_vars_cc')
+def samba_pop_cppflags(self):
+    """append stashed user CPPFLAGS after our internally computed flags"""
+
+    self.env.append_value('_CCINCFLAGS', self.env.SAVED_CPPFLAGS)
+    self.env.SAVED_CPPFLAGS = []
+
 @feature('cprogram', 'cshlib', 'cstaticlib')
 @before('apply_obj_vars', 'add_extra_flags')
 def samba_stash_linkflags(self):
     """stash away LINKFLAGS in order to fix waf's broken ordering wrt or
     user LDFLAGS"""
 
-    self.env.SAVE_LINKFLAGS = self.env['LINKFLAGS']
-    self.env['LINKFLAGS'] = []
+    self.env.SAVE_LINKFLAGS = self.env.LINKFLAGS
+    self.env.LINKFLAGS = []
 
 @feature('cprogram', 'cshlib', 'cstaticlib')
 @after('apply_obj_vars', 'add_extra_flags')