From e501be5d09cee5450d451458de96902c56079d56 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ra=C3=BAl=20Porcel?= <armin76@gentoo.org>
Date: Sun, 5 Sep 2010 18:29:28 +0000
Subject: [PATCH] Restore old behaviour on the CXXFLAGS variable on the created
 make.conf

---
 ChangeLog                       | 4 ++++
 modules/generic_stage_target.py | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 <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 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')
 
-- 
2.26.2