diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-18 12:06:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-31 13:54:53 +0200 |
| commit | 7d2d1bddfe360c29730598918bf2e6a1e83944f7 (patch) | |
| tree | 55c58e5a683c00bd161f19e2da0262e468c8d15e | |
| parent | d737aac2ec589721b92a6312cdee1989e9c28a37 (diff) | |
use QT_TARGET_ARCH to identify target architecture
83f473b changed the semantics of QT_ARCH to be the arch of the currently
built target, not that of the qt libraries. we need the latter here.
on the way, also remove the pointless fallbacks to the host arch.
Change-Id: Ia8c742a5aef36b70a182e6dbad97e41ce7ecbf6e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/v8/v8.pri | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/v8/v8.pri b/src/v8/v8.pri index 6991ee8..085df8d 100644 --- a/src/v8/v8.pri +++ b/src/v8/v8.pri @@ -7,17 +7,19 @@ isEmpty(QT_ARCH) { isEmpty(V8_TARGET_ARCH) { # Detect target - equals(QT_ARCH, x86_64)|contains(CONFIG, x86_64):V8_TARGET_ARCH = x64 - else:equals(QT_ARCH, "i386"): V8_TARGET_ARCH = ia32 - else:equals(QT_ARCH, "mips"): V8_TARGET_ARCH = mips - else:equals(QT_ARCH, "arm"): V8_TARGET_ARCH = arm - else:equals(QMAKE_HOST.arch, armv7l): V8_TARGET_ARCH = arm - else:equals(QMAKE_HOST.arch, armv5tel): V8_TARGET_ARCH = arm - else:equals(QMAKE_HOST.arch, x86_64): V8_TARGET_ARCH = x64 - else:equals(QMAKE_HOST.arch, x86): V8_TARGET_ARCH = ia32 - else:equals(QMAKE_HOST.arch, i386): V8_TARGET_ARCH = ia32 - else:equals(QMAKE_HOST.arch, i686): V8_TARGET_ARCH = ia32 - else:error("Couldn't detect supported v8 architecture ($$QMAKE_HOST.arch/$$QT_ARCH). Currently supported architectures are: x64, x86 and arm") + isEmpty(QT_TARGET_ARCH): \ # not a host build => current arch is target arch + QT_TARGET_ARCH = $$QT_ARCH + + equals(QT_TARGET_ARCH, x86_64): \ + V8_TARGET_ARCH = x64 + else: equals(QT_TARGET_ARCH, "i386"): \ + V8_TARGET_ARCH = ia32 + else: equals(QT_TARGET_ARCH, "mips"): \ + V8_TARGET_ARCH = mips + else: equals(QT_TARGET_ARCH, "arm"): \ + V8_TARGET_ARCH = arm + else: \ + error("Architecture $$QT_TARGET_ARCH is not supported by v8. Currently supported architectures are: x64, x86 and arm") } include($$PWD/v8base.pri) |