f58e95f098
ppc/ppc64 and 32-bit x86 have been dead for a while. consequently, the legacy macx-g++-64 spec was most probably not used. which in turn meant that NATIVE_64_ARCH was never set (in particular on windows hosts ...), which means that the android ndk host auto-detection was effectively broken. the arch code in mac/default_post.prf was also never triggered, so nuke it as well. Change-Id: Ic0775e40b273a22e0a15808cac328e0df33c2155 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
67 lines
2.9 KiB
Plaintext
67 lines
2.9 KiB
Plaintext
load(default_post)
|
|
!no_objective_c:CONFIG += objective_c
|
|
|
|
qt {
|
|
contains(QT_CONFIG, static) {
|
|
# C++11 support means using libc++ instead of libstd++. As the
|
|
# two libraries are incompatible we need to ensure the end user
|
|
# project is built using the same C++11 support/no support as Qt.
|
|
contains(QT_CONFIG, c++11) {
|
|
CONFIG += c++11
|
|
} else: c++11 {
|
|
warning("Qt was not built with C++11 enabled, disabling feature")
|
|
CONFIG -= c++11
|
|
}
|
|
|
|
!c++11 {
|
|
# Explicitly use libstdc++ if C++11 support is not enabled,
|
|
# as otherwise the compiler will choose the standard library
|
|
# based on the deployment target, which for iOS 7 and OS X 10.9
|
|
# is libc++, and we can't mix and match the two.
|
|
QMAKE_CXXFLAGS += -stdlib=libstdc++
|
|
QMAKE_LFLAGS += -stdlib=libstdc++
|
|
}
|
|
}
|
|
# If Qt was built with shared libraries with rpath support and project does
|
|
# not specify own rpaths (including empty list) add one pointing to Qt
|
|
# libraries. This applies only to apps, since all loaded libraries inherit
|
|
# rpaths from current process executable.
|
|
else:!if(host_build:force_bootstrap):equals(TEMPLATE, app):!defined(QMAKE_RPATHDIR, var):contains(QT_CONFIG, rpath) {
|
|
# If app is expected to be installed into the Qt prefix build, use
|
|
# relative path, so all SDK tools and examples work when relocated.
|
|
prefix_build:defined(target.path, var):\
|
|
contains(target.path, "$$re_escape($$[QT_INSTALL_PREFIX])/.*"):\
|
|
# Tests are an exception, since they are launched in their build not
|
|
# install location by CI, so we cannot use relative rpaths there.
|
|
!contains(target.path, "$$re_escape($$[QT_INSTALL_TESTS])/.*") {
|
|
app_bundle {
|
|
ios: binpath = $$target.path/$${TARGET}.app
|
|
else: binpath = $$target.path/$${TARGET}.app/Contents/MacOS
|
|
} else {
|
|
binpath = $$target.path
|
|
}
|
|
QMAKE_RPATHDIR = @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath)
|
|
unset(binpath)
|
|
} else {
|
|
# Otherwise, use absolute path to Qt libraries
|
|
QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]
|
|
}
|
|
}
|
|
}
|
|
|
|
macx-xcode:!isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
|
|
debug_information_format.name = DEBUG_INFORMATION_FORMAT
|
|
debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT
|
|
debug_information_format.build = debug
|
|
QMAKE_MAC_XCODE_SETTINGS += debug_information_format
|
|
}
|
|
|
|
cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
|
|
cache(QMAKE_XCODE_VERSION, stash)
|
|
|
|
QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
|
|
|
|
# Ensure that we process sdk.prf first, as it will update QMAKE_CXX
|
|
# and friends that other features/extra compilers may depend on.
|
|
sdk: load(sdk)
|