c3278e3353
And use configure's -sdk argument to choose between the iphoneos and the iphonesimulator SDK. xcodebuild -showsdks can be used to list the available SDKs. Passing an SDK without a version postfix implies the latest version of the SDK. Change-Id: I881df754d522fc91aaa16ba3e39cf0c37a21a1f1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
26 lines
960 B
Plaintext
26 lines
960 B
Plaintext
isEmpty(QT_ARCH) {
|
|
# The iPhoneOS and iPhoneSimulator targets share the same toolchain,
|
|
# so when configure runs the arch tests it passes the correct sysroot,
|
|
# but we fail to pick up the architecture since we're not passing -arch
|
|
# yet. Xcode does not seem to have a way to run the shared toolchain
|
|
# in a way that will automatically do this (for example xcrun -sdk).
|
|
contains(QMAKE_MAC_SDK, iphoneos.*): QT_ARCH = armv7
|
|
else: QT_ARCH = i386 # Simulator
|
|
} else {
|
|
# Fix up the QT_ARCH to be more specific
|
|
equals(QT_ARCH, arm) {
|
|
# Samsung S5PC100, Apple A4, A5, A5X
|
|
QT_ARCH = armv7
|
|
|
|
# FIXME: How do we support armv7s when Qt can't do universal builds?
|
|
}
|
|
}
|
|
|
|
!equals(MAKEFILE_GENERATOR, XCODE) {
|
|
arch_flag = -arch $$QT_ARCH
|
|
QMAKE_CFLAGS += $$arch_flag
|
|
QMAKE_CXXFLAGS += $$arch_flag
|
|
QMAKE_OBJECTIVE_CFLAGS += $$arch_flag
|
|
QMAKE_LFLAGS += $$arch_flag
|
|
}
|