Restore old behaviour on the CXXFLAGS variable on the created make.conf

diff --git a/ChangeLog b/ChangeLog
index b683ced13ccbeb6da6e854c34d726ae3754626c8..4b517ba28c5205d3da663526a3e81a8cf78108cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  05 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  modules/generic_stage_target.py:
+  Restore old behaviour on the CXXFLAGS variable on the created make.conf
+
   04 Sep 2010; Raúl Porcel <armin76@gentoo.org> 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 92ec3817ace937e62435a5f45ece6f732d8c7851..55baea7833fc0fc84037593b1eaa8836f201c24e 100644 (file)
--- 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')