From b4e808bb8f2e11a7563512c93d0feb09c1143f5d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 22 Dec 2014 11:06:41 +0100 Subject: [PATCH] SQ2 --- buildtools/wafsamba/samba_optimisation.py | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py index f84a24d10e5..589e1acd4eb 100644 --- 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') -- 2.34.1