diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-22 11:38:39 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-25 20:42:21 +0000 |
| commit | 08ee7d8eaa621bf88c30f3c354053625de0b0da0 (patch) | |
| tree | 8a06d97c9feef96b3dfae556fe4ed974d9ae920f /src/buildtools | |
| parent | 3a463740b2026767b87662d70b9aa5a2c85115e5 (diff) | |
Create v8_snapshot gn toolchain from one pro file
Merge the generation of the v8_snapshot toolchain back to being made
in configure_host.pro. This is a lot cleaner and safer against errors,
to make it work however we need to cache the target archicture so that
it is still available with option(host_build) enabled.
Change-Id: Iefed9c97528f8ce338e7a0d4fe5c6884fb4ef4bd
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/configure_host.pro | 16 | ||||
| -rw-r--r-- | src/buildtools/configure_target.pro | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro index d8d731df7..0e113543d 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -5,11 +5,20 @@ TEMPLATE = aux option(host_build) GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) +GN_TARGET_CPU = $$gnArch($$WEBENGINE_ARCH) GN_OS = $$gnOS() clang: GN_CLANG = true else: GN_CLANG = false +GN_V8_HOST_CPU = $$GN_HOST_CPU +contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mips")|contains(GN_TARGET_CPU, "x86") { + # The v8 snapshot need a host that matches bitwidth, so we build makesnapshot to 32-bit variants of host. + contains(GN_V8_HOST_CPU, x64): GN_V8_HOST_CPU = "x86" + else: contains(GN_V8_HOST_CPU, arm64): GN_V8_HOST_CPU = "arm" + else: contains(GN_V8_HOST_CPU, mips64): GN_V8_HOST_CPU = "mips" +} + # We always use the gcc_toolchain, because clang_toolchain is just # a broken wrapper around it for Google's custom clang binaries. GN_CONTENTS = \ @@ -33,8 +42,11 @@ GN_CONTENTS = \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ -" current_os = \"$$GN_OS\" " -# The v8_snapshot toolchain is finished by configure_target.pro +" current_os = \"$$GN_OS\" " \ +" current_cpu = \"$$GN_V8_HOST_CPU\" " \ +" v8_current_cpu = \"$$GN_TARGET_CPU\" " \ +" } " \ +" } " GN_FILE = $$OUT_PWD/../toolchain/BUILD.gn !build_pass { diff --git a/src/buildtools/configure_target.pro b/src/buildtools/configure_target.pro index 1750f4e6f..54841bf51 100644 --- a/src/buildtools/configure_target.pro +++ b/src/buildtools/configure_target.pro @@ -7,19 +7,7 @@ GN_OS = $$gnOS() clang: GN_CLANG = true else: GN_CLANG = false -GN_V8_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) -contains(GN_CPU, "arm")|contains(GN_CPU, "mips")|contains(GN_CPU, "x86") { - # The v8 snapshot need a host that matches bitwidth, so we build makesnapshot to 32-bit variants of host. - contains(GN_V8_HOST_CPU, x64): GN_V8_HOST_CPU = "x86" - else: contains(GN_V8_HOST_CPU, arm64): GN_V8_HOST_CPU = "arm" - else: contains(GN_V8_HOST_CPU, mips64): GN_V8_HOST_CPU = "mips" -} - GN_CONTENTS = \ -" current_cpu = \"$$GN_V8_HOST_CPU\" " \ -" v8_current_cpu = \"$$GN_CPU\" " \ -" } " \ -"}" \ "gcc_toolchain(\"target\") {" \ " cc = \"$$which($$QMAKE_CC)\" " \ " cxx = \"$$which($$QMAKE_CXX)\" " \ |