1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac: Set minimum version to 10.7 for clang-libc++

Browse Source 
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>
This commit is contained in:
Morten Johan Sorvig 2012-10-12 11:31:08 +02:00 committed by The Qt Project
parent 048d28a674
commit 9c6066fce6
13 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/common/gcc-base-macx.conf
View File

@ -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

5
mkspecs/common/mac-clang-libc++-minimum-version.conf Normal file
View File

@ -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

4
mkspecs/common/mac-minimum-version.conf Normal file
View File

@ -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

1
mkspecs/macx-clang-32/qmake.conf
View File

@ -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

1
mkspecs/macx-clang-libc++-32/qmake.conf
View File

@ -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++

1
mkspecs/macx-clang-libc++/qmake.conf
View File

@ -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++

1
mkspecs/macx-clang/qmake.conf
View File

@ -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)

1
mkspecs/macx-g++-32/qmake.conf
View File

@ -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

2
mkspecs/macx-g++/qmake.conf
View File

@ -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)

1
mkspecs/macx-g++40/qmake.conf
View File

@ -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

1
mkspecs/macx-g++42/qmake.conf
View File

@ -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

1
mkspecs/macx-llvm/qmake.conf
View File

@ -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

1
mkspecs/macx-xcode/qmake.conf
View File

@ -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 =