diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-04 18:55:55 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-17 16:35:46 +0000 |
| commit | f58e95f098c8d78a5f2db7729606126fe093cbdf (patch) | |
| tree | 63a76d0aa44eb1a0c9ad2d21ad8f758889801221 /mkspecs/features/mac | |
| parent | f807a6de2c14714ffe0fdddac54ef41325613764 (diff) | |
remove some mac multiarch vestiges
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>
Diffstat (limited to 'mkspecs/features/mac')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index b459389c72..7100717b78 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,20 +1,7 @@ load(default_post) !no_objective_c:CONFIG += objective_c -qt:!isEmpty(QT_CONFIG) { - # Pick a suitable default architecture for qmake-based applications. - # If the Qt package contains one of x86 and x86_64, pick that one. If it - # contains both then use the compiler default. Make a similar decision for - # PowerPC-based systems. Note that this logic assumes that Qt has been - # configured with an architecture that is usable on the system. - contains(QMAKE_HOST.arch, ppc)|contains(QMAKE_HOST.arch, "Power Macintosh") { - !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc - contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64 - } else { - !contains(QT_CONFIG, x86_64):contains(QT_CONFIG, x86):CONFIG += x86 - contains(QT_CONFIG, x86_64):!contains(QT_CONFIG, x86):CONFIG += x86_64 - } - +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 |