[Erp5-report] r45954 luke - /erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmm...

[nobody at svn.erp5.org]

Author: luke
Date: Wed Jun 29 09:36:18 2011
New Revision: 45954

URL: http://svn.erp5.org?rev=45954&view=rev
Log:
Increase flexibility.

Modified:
    erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py?rev=45954&r1=45953&r2=45954&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.cmmiforcei686/src/erp5/recipe/cmmiforcei686/__init__.py [utf8] Wed Jun 29 09:36:18 2011
@@ -29,11 +29,13 @@ class Recipe(OriginalRecipe):
       # no patching needed
       log.debug('No patching needed on %r architecture' % arch)
       return OriginalRecipe.install(self)
-    if 'CFLAGS' in self.environ or 'CXXFLAGS' in self.environ:
+    if 'CFLAGS' in self.environ:
       self.environ['CFLAGS'] += ' -march=i686'
-      self.environ['CXXFLAGS'] += ' -march=i686'
     else:
       self.environ['CFLAGS'] = '-march=i686'
+    if 'CXXFLAGS' in self.environ:
+      self.environ['CXXFLAGS'] += ' -march=i686'
+    else:
       self.environ['CXXFLAGS'] = '-march=i686'
     log.info(
       'Patched CFLAGS and CXXFLAGS on 32bit arch to being able to compile')