From 9c6066fce6b2f96a336956214afb94a8592d2834 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Fri, 12 Oct 2012 11:31:08 +0200 Subject: [PATCH] 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 Reviewed-by: Erik Verbruggen --- mkspecs/common/gcc-base-macx.conf | 4 +--- mkspecs/common/mac-clang-libc++-minimum-version.conf | 5 +++++ mkspecs/common/mac-minimum-version.conf | 4 ++++ mkspecs/macx-clang-32/qmake.conf | 1 + mkspecs/macx-clang-libc++-32/qmake.conf | 1 + mkspecs/macx-clang-libc++/qmake.conf | 1 + mkspecs/macx-clang/qmake.conf | 1 + mkspecs/macx-g++-32/qmake.conf | 1 + mkspecs/macx-g++/qmake.conf | 2 ++ mkspecs/macx-g++40/qmake.conf | 1 + mkspecs/macx-g++42/qmake.conf | 1 + mkspecs/macx-llvm/qmake.conf | 1 + mkspecs/macx-xcode/qmake.conf | 1 + 13 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 mkspecs/common/mac-clang-libc++-minimum-version.conf create mode 100644 mkspecs/common/mac-minimum-version.conf diff --git a/mkspecs/common/gcc-base-macx.conf b/mkspecs/common/gcc-base-macx.conf index 90d1301..45fa248 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 0000000..0941970 --- /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 0000000..acb4132 --- /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 diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf index 2ff6e57..b6cceaf 100644 --- a/mkspecs/macx-clang-32/qmake.conf +++ b/mkspecs/macx-clang-32/qmake.conf @@ -10,6 +10,7 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/clang.conf) include(../common/clang-mac.conf) +include(../common/mac-minimum-version.conf) QMAKE_CFLAGS += -arch i386 QMAKE_OBJECTIVE_CFLAGS += -arch i386 diff --git a/mkspecs/macx-clang-libc++-32/qmake.conf b/mkspecs/macx-clang-libc++-32/qmake.conf index 13ae746..122205c 100644 --- a/mkspecs/macx-clang-libc++-32/qmake.conf +++ b/mkspecs/macx-clang-libc++-32/qmake.conf @@ -10,6 +10,7 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/clang.conf) include(../common/clang-mac.conf) +include(../common/mac-clang-libc++-minimum-version.conf) QMAKE_CFLAGS += -arch i386 QMAKE_OBJECTIVE_CFLAGS += -arch i386 -stdlib=libc++ diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf index e845147..7009598 100644 --- a/mkspecs/macx-clang-libc++/qmake.conf +++ b/mkspecs/macx-clang-libc++/qmake.conf @@ -10,6 +10,7 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/clang.conf) include(../common/clang-mac.conf) +include(../common/mac-clang-libc++-minimum-version.conf) QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++ QMAKE_CXXFLAGS += -stdlib=libc++ diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index a063010..64ce81c 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -10,5 +10,6 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/clang.conf) include(../common/clang-mac.conf) +include(../common/mac-minimum-version.conf) load(qt_config) diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf index 2e6f3c8..845c387 100644 --- a/mkspecs/macx-g++-32/qmake.conf +++ b/mkspecs/macx-g++-32/qmake.conf @@ -13,6 +13,7 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) +include(../common/mac-minimum-version.conf) QMAKE_CFLAGS += -arch i386 QMAKE_OBJECTIVE_CFLAGS += -arch i386 diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 9eacd50..32da734 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -13,4 +13,6 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) +include(../common/mac-minimum-version.conf) + load(qt_config) diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf index 95c9c75..7f581ae 100644 --- a/mkspecs/macx-g++40/qmake.conf +++ b/mkspecs/macx-g++40/qmake.conf @@ -13,6 +13,7 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) +include(../common/mac-minimum-version.conf) QMAKE_CC = gcc-4.0 QMAKE_CXX = g++-4.0 diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index c5ce36d..d4803da 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -13,6 +13,7 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) +include(../common/mac-minimum-version.conf) QMAKE_CC = gcc-4.2 QMAKE_CXX = g++-4.2 diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf index 2733c82..d43eefe 100644 --- a/mkspecs/macx-llvm/qmake.conf +++ b/mkspecs/macx-llvm/qmake.conf @@ -13,6 +13,7 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/llvm.conf) +include(../common/mac-minimum-version.conf) QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index cb34280..8504310 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -10,6 +10,7 @@ CONFIG += lib_version_first incremental plugin_no_soname app_bundle include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) +include(../common/mac-minimum-version.conf) QMAKE_LINK = QMAKE_LINK_C = -- 2.7.4