4eeaed2
diff -pruN gyp.orig/pylib/gyp/generator/make.py gyp/pylib/gyp/generator/make.py
4eeaed2
--- gyp.orig/pylib/gyp/generator/make.py	2011-08-23 16:47:59.000000000 +0900
4eeaed2
+++ gyp/pylib/gyp/generator/make.py	2011-08-23 17:31:13.000000000 +0900
4eeaed2
@@ -1554,6 +1554,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
b9cc533
     # Write configuration-specific variables for CFLAGS, etc.
b9cc533
     for configname in sorted(configs.keys()):
b9cc533
       config = configs[configname]
b9cc533
+      rpmoptflags = ['$(RPM_OPT_FLAGS)']
b9cc533
       self.WriteList(config.get('defines'), 'DEFS_%s' % configname, prefix='-D',
b9cc533
           quoter=EscapeCppDefine)
4eeaed2
 
4eeaed2
@@ -1565,8 +1566,20 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
4eeaed2
         cflags_objcc = self.xcode_settings.GetCflagsObjCC(configname)
4eeaed2
       else:
4eeaed2
         cflags = config.get('cflags')
4eeaed2
+        if cflags:
4eeaed2
+          cflags += rpmoptflags
4eeaed2
+        else:
4eeaed2
+          cflags = rpmoptflags
4eeaed2
         cflags_c = config.get('cflags_c')
4eeaed2
+        if cflags_c:
4eeaed2
+          cflags_c += rpmoptflags
4eeaed2
+        else:
4eeaed2
+          cflags_c = rpmoptflags
4eeaed2
         cflags_cc = config.get('cflags_cc')
4eeaed2
+        if cflags_cc:
4eeaed2
+          cflags_cc += rpmoptflags
4eeaed2
+        else:
4eeaed2
+          cflags_cc = rpmoptflags
4eeaed2
 
4eeaed2
       self.WriteLn("# Flags passed to all source files.");
4eeaed2
       self.WriteList(cflags, 'CFLAGS_%s' % configname)