Index: pylib/gyp/generator/make.py
===================================================================
--- pylib/gyp/generator/make.py	(revision 840)
+++ pylib/gyp/generator/make.py	(working copy)
@@ -857,14 +857,30 @@
     # Write configuration-specific variables for CFLAGS, etc.
     for configname in sorted(configs.keys()):
       config = configs[configname]
+      rpmoptflags = ['$(RPM_OPT_FLAGS)']
       self.WriteList(config.get('defines'), 'DEFS_%s' % configname, prefix='-D',
           quoter=EscapeCppDefine)
       self.WriteLn("# Flags passed to both C and C++ files.");
-      self.WriteList(config.get('cflags'), 'CFLAGS_%s' % configname)
+      cflags = config.get('cflags')
+      if cflags:
+        cflags += rpmoptflags
+      else:
+        cflags = rpmoptflags
+      self.WriteList(cflags, 'CFLAGS_%s' % configname)
       self.WriteLn("# Flags passed to only C (and not C++) files.");
-      self.WriteList(config.get('cflags_c'), 'CFLAGS_C_%s' % configname)
+      ccflags = config.get('cflags_c')
+      if ccflags:
+        ccflags += rpmoptflags
+      else:
+        ccflags = rpmoptflags
+      self.WriteList(ccflags, 'CFLAGS_C_%s' % configname)
       self.WriteLn("# Flags passed to only C++ (and not C) files.");
-      self.WriteList(config.get('cflags_cc'), 'CFLAGS_CC_%s' % configname)
+      cxxflags = config.get('cflags_cc')
+      if cxxflags:
+        cxxflags += rpmoptflags
+      else:
+        cxxflags = rpmoptflags
+      self.WriteList(cxxflags, 'CFLAGS_CC_%s' % configname)
       includes = config.get('include_dirs')
       if includes:
         includes = map(Sourceify, map(self.Absolutify, includes))