Remove all usages of "arch" CFLAGS on Mac.

Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS
and OBJECTIVE_CFLAGS. Delete the arch prf files.

32/64 bit arch selection will be made using a different
mechanism in Qt 5. Universal builds are not supported.

Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
index acce2fe..1a983ed 100644 (file)
--- a/mkspecs/common/g++-macx.conf
+++ b/mkspecs/common/g++-macx.conf
@@ -16,13 +16,6 @@ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g $$QMAKE_CFLAGS_DWARF2
 
 QMAKE_LFLAGS_STATIC_LIB += -all_load
 
-QMAKE_CXXFLAGS_X86_64         = $$QMAKE_CFLAGS_X86_64
-QMAKE_CXXFLAGS_PPC_64         = $$QMAKE_CFLAGS_PPC_64
-QMAKE_OBJECTIVE_CFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
-QMAKE_OBJECTIVE_CFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64
-QMAKE_LFLAGS_X86_64           = $$QMAKE_CFLAGS_X86_64
-QMAKE_LFLAGS_PPC_64           = $$QMAKE_CFLAGS_PPC_64
-
 QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE
 QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}

diff --git a/mkspecs/common/gcc-base-macx.conf b/mkspecs/common/gcc-base-macx.conf
index 1e51fbd..e829a55 100644 (file)
--- a/mkspecs/common/gcc-base-macx.conf
+++ b/mkspecs/common/gcc-base-macx.conf
@@ -13,17 +13,9 @@ include(gcc-base.conf)
 QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4
 
 QMAKE_CFLAGS        += -mmacosx-version-min=10.6
-QMAKE_CFLAGS_X86    += -arch i386
-QMAKE_CFLAGS_X86_64 += -arch x86_64
-QMAKE_CFLAGS_PPC    += -arch ppc
-QMAKE_CFLAGS_PPC_64 += -arch ppc64
 QMAKE_CFLAGS_DWARF2 += -gdwarf-2
 
 QMAKE_CXXFLAGS        += -mmacosx-version-min=10.6
-QMAKE_CXXFLAGS_X86    += $$QMAKE_CFLAGS_X86
-QMAKE_CXXFLAGS_X86_64 += $$QMAKE_CFLAGS_X86_64
-QMAKE_CXXFLAGS_PPC    += $$QMAKE_CFLAGS_PPC
-QMAKE_CXXFLAGS_PPC_64 += $$QMAKE_CFLAGS_PPC_64
 QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
 
 QMAKE_OBJECTIVE_CFLAGS          = $$QMAKE_CFLAGS
@@ -32,16 +24,8 @@ QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_OBJECTIVE_CFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_OBJECTIVE_CFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
 QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
-QMAKE_OBJECTIVE_CFLAGS_X86      = $$QMAKE_CFLAGS_X86
-QMAKE_OBJECTIVE_CFLAGS_X86_64   = $$QMAKE_CFLAGS_X86_64
-QMAKE_OBJECTIVE_CFLAGS_PPC      = $$QMAKE_CFLAGS_PPC
-QMAKE_OBJECTIVE_CFLAGS_PPC_64   = $$QMAKE_CFLAGS_PPC_64
 
 QMAKE_LFLAGS        += -headerpad_max_install_names -mmacosx-version-min=10.6
-QMAKE_LFLAGS_X86    += $$QMAKE_CFLAGS_X86
-QMAKE_LFLAGS_X86_64 += $$QMAKE_CFLAGS_X86_64
-QMAKE_LFLAGS_PPC    += $$QMAKE_CFLAGS_PPC
-QMAKE_LFLAGS_PPC_64 += $$QMAKE_CFLAGS_PPC_64
 
 QMAKE_LFLAGS_SHLIB          += -single_module -dynamiclib
 QMAKE_LFLAGS_PLUGIN         += $$QMAKE_LFLAGS_SHLIB

diff --git a/mkspecs/features/mac/ppc.prf b/mkspecs/features/mac/ppc.prf
deleted file mode 100644 (file)
index e9169d9..0000000
--- a/mkspecs/features/mac/ppc.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-macx-xcode|macx-pbuilder {
-} else {
-    QMAKE_CFLAGS += $$QMAKE_CFLAGS_PPC
-    QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_PPC
-    QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_PPC
-    QMAKE_LFLAGS += $$QMAKE_LFLAGS_PPC
-}

diff --git a/mkspecs/features/mac/ppc64.prf b/mkspecs/features/mac/ppc64.prf
deleted file mode 100644 (file)
index 5a04d5b..0000000
--- a/mkspecs/features/mac/ppc64.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-macx-xcode|macx-pbuilder {
-} else {
-    QMAKE_CFLAGS += $$QMAKE_CFLAGS_PPC_64
-    QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_PPC_64
-    QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_PPC_64
-    QMAKE_LFLAGS += $$QMAKE_LFLAGS_PPC_64
-}

diff --git a/mkspecs/features/mac/x86.prf b/mkspecs/features/mac/x86.prf
deleted file mode 100644 (file)
index a7a9f84..0000000
--- a/mkspecs/features/mac/x86.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-macx-xcode|macx-pbuilder {
-} else {
-   QMAKE_CFLAGS += $$QMAKE_CFLAGS_X86
-   QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_X86
-   QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_X86
-   QMAKE_LFLAGS += $$QMAKE_LFLAGS_X86
-}

diff --git a/mkspecs/features/mac/x86_64.prf b/mkspecs/features/mac/x86_64.prf
deleted file mode 100644 (file)
index 65b6b79..0000000
--- a/mkspecs/features/mac/x86_64.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-macx-xcode|macx-pbuilder {
-} else {
-   QMAKE_CFLAGS += $$QMAKE_CFLAGS_X86_64
-   QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_X86_64
-   QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_X86_64
-   QMAKE_LFLAGS += $$QMAKE_LFLAGS_X86_64
-}

diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index d93ed5e..77713c5 100644 (file)
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -31,8 +31,6 @@ QMAKE_CFLAGS_SHLIB    = -fpic
 QMAKE_CFLAGS_STATIC_LIB        = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD    = 
-#QMAKE_CFLAGS_PPC        = -arch ppc
-#QMAKE_CFLAGS_X86        = -arch i386
 
 QMAKE_OBJECTIVE_CC      = gcc
 QMAKE_OBJECTIVE_CFLAGS         = -pipe
@@ -41,8 +39,6 @@ QMAKE_OBJECTIVE_CFLAGS_WARN_OFF       = -w
 QMAKE_OBJECTIVE_CFLAGS_RELEASE = -Os
 QMAKE_OBJECTIVE_CFLAGS_DEBUG   = -g
 QMAKE_OBJECTIVE_CFLAGS_HIDESYMS   = -fvisibility=hidden
-QMAKE_OBJECTIVE_CFLAGS_PPC        = -arch ppc
-QMAKE_OBJECTIVE_CFLAGS_X86        = -arch i386
 
 QMAKE_CXX              = icpc
 QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
@@ -55,8 +51,6 @@ QMAKE_CXXFLAGS_SHLIB  = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
 QMAKE_CXXFLAGS_YACC    = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD  = $$QMAKE_CFLAGS_THREAD
-QMAKE_CXXFLAGS_PPC      = $$QMAKE_CFLAGS_PPC
-QMAKE_CXXFLAGS_X86      = $$QMAKE_CFLAGS_X86
 
 QMAKE_LINK             = icpc
 QMAKE_LINK_SHLIB       = icpc
@@ -68,8 +62,6 @@ QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
 QMAKE_LFLAGS_PLUGIN    = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME    = -install_name$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_THREAD    =
-#QMAKE_LFLAGS_PPC        = -arch ppc
-#QMAKE_LFLAGS_X86        = -arch i386
 QMAKE_LFLAGS_RPATH     =
 
 QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}

diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf
index de14562..6b6a1a1 100644 (file)
--- a/mkspecs/macx-xcode/qmake.conf
+++ b/mkspecs/macx-xcode/qmake.conf
@@ -18,10 +18,6 @@ QMAKE_LINK_C                    =
 QMAKE_LINK_C_SHLIB              =
 QMAKE_LINK_SHLIB                =
 QMAKE_CFLAGS_HIDESYMS           = 
-QMAKE_CFLAGS_PPC_64             =
-QMAKE_CFLAGS_X86_64             =
-QMAKE_CFLAGS_PPC                =
-QMAKE_CFLAGS_X86                =
 QMAKE_LFLAGS_VERSION            =
 QMAKE_LFLAGS_COMPAT_VERSION     =
 QMAKE_LFLAGS_SONAME             =