diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-10-12 11:31:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-24 01:39:45 +0200 |
| commit | 9c6066fce6b2f96a336956214afb94a8592d2834 (patch) | |
| tree | 0c7f01d76b1315fedc895e0fd0e67418fa272035 /mkspecs/common | |
| parent | 048d28a674cd1cbbc738a3045ae967323a9d41e9 (diff) | |
Mac: Set minimum version to 10.7 for clang-libc++
Clang's libc++ does not support 10.6.
Add mac-minimum-version.conf which sets the version
to 10.6. Set the version to 10.7 in the clang-libx++*
mkspecs.
Change-Id: I494d0d24b0d73d9395e9d5406c8c63c9af87f8cc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/gcc-base-macx.conf | 4 | ||||
| -rw-r--r-- | mkspecs/common/mac-clang-libc++-minimum-version.conf | 5 | ||||
| -rw-r--r-- | mkspecs/common/mac-minimum-version.conf | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/mkspecs/common/gcc-base-macx.conf b/mkspecs/common/gcc-base-macx.conf index 90d1301e48..45fa248b66 100644 --- a/mkspecs/common/gcc-base-macx.conf +++ b/mkspecs/common/gcc-base-macx.conf @@ -12,10 +12,8 @@ include(gcc-base.conf) QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 -QMAKE_CFLAGS += -mmacosx-version-min=10.6 QMAKE_CFLAGS_DEBUG += -gdwarf-2 -QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 QMAKE_CXXFLAGS_DEBUG += -gdwarf-2 QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS @@ -25,7 +23,7 @@ QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS -QMAKE_LFLAGS += -headerpad_max_install_names -mmacosx-version-min=10.6 +QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB diff --git a/mkspecs/common/mac-clang-libc++-minimum-version.conf b/mkspecs/common/mac-clang-libc++-minimum-version.conf new file mode 100644 index 0000000000..0941970b13 --- /dev/null +++ b/mkspecs/common/mac-clang-libc++-minimum-version.conf @@ -0,0 +1,5 @@ +# clang libc++ requires 10.7 +QMAKE_CFLAGS += -mmacosx-version-min=10.7 +QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 +QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.7 +QMAKE_LFLAGS += -mmacosx-version-min=10.7 diff --git a/mkspecs/common/mac-minimum-version.conf b/mkspecs/common/mac-minimum-version.conf new file mode 100644 index 0000000000..acb4132cb6 --- /dev/null +++ b/mkspecs/common/mac-minimum-version.conf @@ -0,0 +1,4 @@ +QMAKE_CFLAGS += -mmacosx-version-min=10.6 +QMAKE_LFLAGS += -mmacosx-version-min=10.6 +QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 +QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.6 |