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

[nobody at svn.erp5.org]

Author: luke
Date: Wed Jun 29 09:24:18 2011
New Revision: 45950

URL: http://svn.erp5.org?rev=45950&view=rev
Log:
Append flags instead of dropping them.

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=45950&r1=45949&r2=45950&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:24:18 2011
@@ -31,10 +31,11 @@ class Recipe(OriginalRecipe):
       log.debug('No patching needed on %r architecture' % arch)
       return OriginalRecipe.install(self)
     if 'CFLAGS' in self.environ or 'CXXFLAGS' in self.environ:
-      raise zc.buildout.UserError('Cannot patch environment variable '
-            'CFLAGS and CXXFLAGS as set by user')
-    self.environ['CFLAGS'] = '-march=i686'
-    self.environ['CXXFLAGS'] = '-march=i686'
+      self.environ['CFLAGS'] += ' -march=i686'
+      self.environ['CXXFLAGS'] += ' -march=i686'
+    else:
+      self.environ['CFLAGS'] = '-march=i686'
+      self.environ['CXXFLAGS'] = '-march=i686'
     log.info(
       'Patched CFLAGS and CXXFLAGS on 32bit arch to being able to compile')