Clean up how we build against SDKs on Mac OS
Instead of setting -isysroot in both arch.test, compile.test, the various
mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake
variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf.
The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected
to be of the short-form name, eg macosx or iphoneos, not a full path, as
that's what Xcode also expects. We take care of translating that into
a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as
a helper.
Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-15 17:11:04 +00:00
|
|
|
!host_build:!isEmpty(QMAKE_MAC_SDK) {
|
|
|
|
|
|
|
|
contains(QMAKE_MAC_SDK, .*/.*): \
|
|
|
|
error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")
|
|
|
|
|
|
|
|
QMAKE_MAC_SDK_INFO = $$system("xcodebuild -sdk $$QMAKE_MAC_SDK -version 2>/dev/null", lines)
|
|
|
|
isEmpty(QMAKE_MAC_SDK_INFO): error("Could not resolve SDK \'$$QMAKE_MAC_SDK\'")
|
|
|
|
|
|
|
|
defineReplace(qtMacSDKInfo): \
|
|
|
|
return($$replace($$list($$find(QMAKE_MAC_SDK_INFO, ^$$1:)), ^$$1:(.*), \\1))
|
|
|
|
|
|
|
|
QMAKE_MAC_SDK_PATH = $$qtMacSDKInfo(Path)
|
|
|
|
|
|
|
|
!equals(MAKEFILE_GENERATOR, XCODE) {
|
|
|
|
QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH
|
|
|
|
QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH
|
|
|
|
QMAKE_OBJECTIVE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH
|
|
|
|
QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
Clean up how we build against SDKs on Mac OS
Instead of setting -isysroot in both arch.test, compile.test, the various
mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake
variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf.
The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected
to be of the short-form name, eg macosx or iphoneos, not a full path, as
that's what Xcode also expects. We take care of translating that into
a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as
a helper.
Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-15 17:11:04 +00:00
|
|
|
|
|
|
|
sysrootified =
|
|
|
|
for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
|
|
|
|
QMAKE_INCDIR_OPENGL = $$sysrootified
|
2013-02-15 16:27:51 +00:00
|
|
|
|
|
|
|
# We use xml as the output format instead of json since plutil on 10.6 does not have that option
|
|
|
|
QMAKE_MAC_PLATFORM_NAME = $$system("plutil -convert xml1 \"$$QMAKE_MAC_SDK_PATH/SDKSettings.plist\" -o - | " \
|
|
|
|
"PERL5LIB= xpath 'string(//key[.=\"PLATFORM_NAME\"]/following-sibling::*[1])' 2>&1 | " \
|
|
|
|
"sed 's/.*Value: \\(.*\\)/\\1/'")
|
|
|
|
|
|
|
|
isEmpty(QMAKE_MAC_PLATFORM_NAME): error("Could not resolve platform name for SDK '$$QMAKE_MAC_SDK'")
|
|
|
|
|
|
|
|
} else {
|
|
|
|
# Host tools require Mac OS X >= 10.6
|
|
|
|
QMAKE_MAC_PLATFORM_NAME = macosx
|
|
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
|
|
|
|
}
|
|
|
|
|
|
|
|
!equals(MAKEFILE_GENERATOR, XCODE) {
|
|
|
|
version_min_flag = -m$${QMAKE_MAC_PLATFORM_NAME}-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
|
|
|
|
QMAKE_CFLAGS += $$version_min_flag
|
|
|
|
QMAKE_CXXFLAGS += $$version_min_flag
|
|
|
|
QMAKE_OBJECTIVE_CFLAGS += $$version_min_flag
|
|
|
|
QMAKE_LFLAGS += $$version_min_flag
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|