From c655e0d8053255e8ec565e842c6afeafc2f317b4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 22 Dec 2014 11:02:16 +0100 Subject: [PATCH] SQ --- buildtools/wafsamba/samba_optimisation.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py index 4e59d310268..f84a24d10e5 100644 --- 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'] = [] -- 2.34.1