diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-05-03 10:50:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 09:19:23 +0200 |
| commit | 976619bd598cb630d466aa32dbf4281bf1504bc0 (patch) | |
| tree | b5f8af92c355597788f64581625debb8c5dd0698 /mkspecs/macx-icc | |
| parent | ee8eef9195f3c32b3365bbd54d56b53e682ae7d0 (diff) | |
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>
Diffstat (limited to 'mkspecs/macx-icc')
| -rw-r--r-- | mkspecs/macx-icc/qmake.conf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index d93ed5e70d..77713c5225 100644 --- 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} |