From: Raúl Porcel Date: Sun, 5 Sep 2010 18:29:28 +0000 (+0000) Subject: Restore old behaviour on the CXXFLAGS variable on the created make.conf X-Git-Tag: CATALYST_2_0_6_916~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e501be5d09cee5450d451458de96902c56079d56;p=catalyst.git Restore old behaviour on the CXXFLAGS variable on the created make.conf --- diff --git a/ChangeLog b/ChangeLog index b683ced1..4b517ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ # Distributed under the GPL v2 # $Id$ + 05 Sep 2010; Raúl Porcel + modules/generic_stage_target.py: + Restore old behaviour on the CXXFLAGS variable on the created make.conf + 04 Sep 2010; Raúl Porcel arch/arm.py: Fix typo and add armv7a-hardfp target diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 92ec3817..55baea78 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1005,7 +1005,10 @@ class generic_stage_target(generic_target): if self.settings.has_key("CFLAGS"): myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') if self.settings.has_key("CXXFLAGS"): - myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') + if self.settings["CXXFLAGS"]!=self.settings["CFLAGS"]: + myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') + else: + myf.write('CXXFLAGS="${CFLAGS}"\n') else: myf.write('CXXFLAGS="${CFLAGS}"\n')