sip-4.10.5-add-ignore-predefined-cflags-options.patch

sip-4.10.5-add-ignore-predefined-cflags-options.patch (text/plain), 748 bytes, created by Egor Y. Egorov on 2010-07-31 17:12:00 UTC

diff -Nur sip-4.10.5_orig/siputils.py sip-4.10.5/siputils.py
--- sip-4.10.5_orig/siputils.py	2010-07-16 21:07:33.000000000 +0700
+++ sip-4.10.5/siputils.py	2010-08-01 00:08:43.611000034 +0700
@@ -512,8 +512,9 @@
                 cflags.extend(self.optional_list("CFLAGS_CONSOLE"))
                 cxxflags.extend(self.optional_list("CXXFLAGS_CONSOLE"))
 
-        cflags.extend(self.optional_list(cflags_debug))
-        cxxflags.extend(self.optional_list(cxxflags_debug))
+        if not os.getenv('QMAKE_IGNORE_PREDEFINED_CFLAGS'):
+            cflags.extend(self.optional_list(cflags_debug))
+            cxxflags.extend(self.optional_list(cxxflags_debug))
         lflags.extend(self.optional_list(lflags_debug))
 
         if self._warnings: