SQ

diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index 4e59d310268e26b763d9ff4b978fd4af288d3fa2..f84a24d10e53b63edfdcf32a3547accdf3e96bff 100644 (file)
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -59,13 +59,6 @@ def apply_incpaths(self):
         if node:
             self.env.append_value('INC_PATHS', node)
 
-@feature('cc')
-@before('apply_incpaths')
-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')
 def apply_obj_vars_cc(self):
@@ -97,6 +90,16 @@ 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'] = []