Make clang happy without breaking OSX builds..

MythTV · Dec 10, 2012 · ac4dff8 · ac4dff8
1 parent ebf98a3
commit ac4dff8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/mythtv/settings.pro b/mythtv/settings.pro
@@ -110,8 +110,15 @@ CXX_PP_FLAGS -= -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
 macx: QMAKE_CFLAGS_STATIC_LIB += -fno-common
 
 # figure out compile flags based on qmake info
+# qmake 4.8.2 & 4.8.3 messes up OSX "-arch i386 -arch x86_64"
+# clang 3.0 on Linux does not like duplicate arguments.
+macx {
+QMAKE_CFLAGS   += $$CPPFLAGS   $$CFLAGS
+QMAKE_CXXFLAGS += $$CXXPPFLAGS $$ECXXFLAGS
+} else {
 QMAKE_CFLAGS   *= $$CPPFLAGS   $$CFLAGS
 QMAKE_CXXFLAGS *= $$CXXPPFLAGS $$ECXXFLAGS
+}
 
 profile:CONFIG += debug