From c9087a715a9361f1a659a5e5783c2b7b3ba8d638 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Wed, 16 Jul 2014 09:53:32 +0000 Subject: [PATCH] Revert "Remove erroneous uses of CXX / CXX_target / CXX_host from gyp." This reverts commit r22425 for breaking the Arm debug builder. BUG=384474 TBR=jkummerow@chromium.org Review URL: https://codereview.chromium.org/393273002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22427 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- build/android.gypi | 11 +++- build/toolchain.gypi | 144 +++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 76 deletions(-) diff --git a/build/android.gypi b/build/android.gypi index e5b8719..098109e 100644 --- a/build/android.gypi +++ b/build/android.gypi @@ -265,8 +265,15 @@ }], # _toolset=="target" # Settings for building host targets using the system toolchain. ['_toolset=="host"', { - 'cflags': [ '-pthread' ], - 'ldflags': [ '-pthread' ], + 'conditions': [ + ['target_arch=="x64"', { + 'cflags': [ '-m64', '-pthread' ], + 'ldflags': [ '-m64', '-pthread' ], + }, { + 'cflags': [ '-m32', '-pthread' ], + 'ldflags': [ '-m32', '-pthread' ], + }], + ], 'ldflags!': [ '-Wl,-z,noexecstack', '-Wl,--gc-sections', diff --git a/build/toolchain.gypi b/build/toolchain.gypi index 6cad1e2..d7c52ea 100644 --- a/build/toolchain.gypi +++ b/build/toolchain.gypi @@ -31,7 +31,7 @@ 'variables': { 'msvs_use_common_release': 0, 'gcc_version%': 'unknown', - 'clang%': 0, + 'CXX%': '${CXX:-$(which g++)}', # Used to assemble a shell command. 'v8_target_arch%': '<(target_arch)', # Native Client builds currently use the V8 ARM JIT and # arm/simulator-arm.cc to defer the significant effort required @@ -83,27 +83,6 @@ # Allow to suppress the array bounds warning (default is no suppression). 'wno_array_bounds%': '', }, - 'conditions': [ - ['host_arch=="ia32" or host_arch=="x64" or clang==1', { - 'variables': { - 'host_cxx_is_biarch%': 1, - }, - }, { - 'variables': { - 'host_cxx_is_biarch%': 0, - }, - }], - ['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \ - clang==1', { - 'variables': { - 'target_cxx_is_biarch%': 1, - }, - }, { - 'variables': { - 'target_cxx_is_biarch%': 0, - }, - }], - ], 'target_defaults': { 'conditions': [ ['v8_target_arch=="arm"', { @@ -142,9 +121,11 @@ ], 'target_conditions': [ ['_toolset=="host"', { + 'variables': { + 'armcompiler': '&1 | grep -q "^Target: arm" && echo "yes" || echo "no")', + }, 'conditions': [ - ['v8_target_arch==host_arch', { - # Host built with an Arm CXX compiler. + ['armcompiler=="yes"', { 'conditions': [ [ 'arm_version==7', { 'cflags': ['-march=armv7-a',], @@ -167,8 +148,7 @@ }], ], }, { - # 'v8_target_arch!=host_arch' - # Host not built with an Arm CXX compiler (simulator build). + # armcompiler=="no" 'conditions': [ [ 'arm_float_abi=="hard"', { 'defines': [ @@ -185,9 +165,11 @@ ], }], # _toolset=="host" ['_toolset=="target"', { + 'variables': { + 'armcompiler': '&1 | grep -q "^Target: arm" && echo "yes" || echo "no")', + }, 'conditions': [ - ['v8_target_arch==target_arch', { - # Target built with an Arm CXX compiler. + ['armcompiler=="yes"', { 'conditions': [ [ 'arm_version==7', { 'cflags': ['-march=armv7-a',], @@ -210,8 +192,7 @@ }], ], }, { - # 'v8_target_arch!=target_arch' - # Target not built with an Arm CXX compiler (simulator build). + # armcompiler=="no" 'conditions': [ [ 'arm_float_abi=="hard"', { 'defines': [ @@ -249,9 +230,11 @@ 'defines': [ 'V8_TARGET_ARCH_MIPS', ], + 'variables': { + 'mipscompiler': '&1 | grep -q "^Target: mips" && echo "yes" || echo "no")', + }, 'conditions': [ - ['v8_target_arch==target_arch', { - # Target built with a Mips CXX compiler. + ['mipscompiler=="yes"', { 'target_conditions': [ ['_toolset=="target"', { 'cflags': ['-EB'], @@ -298,9 +281,11 @@ 'defines': [ 'V8_TARGET_ARCH_MIPS', ], + 'variables': { + 'mipscompiler': '&1 | grep -q "^Target: mips" && echo "yes" || echo "no")', + }, 'conditions': [ - ['v8_target_arch==target_arch', { - # Target built with a Mips CXX compiler. + ['mipscompiler=="yes"', { 'target_conditions': [ ['_toolset=="target"', { 'cflags': ['-EL'], @@ -353,9 +338,11 @@ 'defines': [ 'V8_TARGET_ARCH_MIPS64', ], + 'variables': { + 'mipscompiler': '&1 | grep -q "^Target: mips" && echo "yes" || echo "no")', + }, 'conditions': [ - ['v8_target_arch==target_arch', { - # Target built with a Mips CXX compiler. + ['mipscompiler=="yes"', { 'target_conditions': [ ['_toolset=="target"', { 'cflags': ['-EL'], @@ -452,28 +439,44 @@ }, }, }], - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ + or OS=="netbsd" or OS=="qnx"', { + 'conditions': [ + [ 'v8_no_strict_aliasing==1', { + 'cflags': [ '-fno-strict-aliasing' ], + }], + ], # conditions + }], + ['OS=="solaris"', { + 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. + }], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ - (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ - v8_target_arch=="x87" or v8_target_arch=="mips" or \ - v8_target_arch=="mipsel")', { + (v8_target_arch=="arm" or v8_target_arch=="ia32" or v8_target_arch=="x87" or\ + v8_target_arch=="mips" or v8_target_arch=="mipsel")', { + # Check whether the host compiler and target compiler support the + # '-m32' option and set it if so. 'target_conditions': [ ['_toolset=="host"', { - 'conditions': [ - ['host_cxx_is_biarch==1', { - 'cflags': [ '-m32' ], - 'ldflags': [ '-m32' ] - }], - ], + 'variables': { + 'm32flag': ' /dev/null 2>&1 < /dev/null) && echo "-m32" || true)', + }, + 'cflags': [ '<(m32flag)' ], + 'ldflags': [ '<(m32flag)' ], 'xcode_settings': { 'ARCHS': [ 'i386' ], }, }], ['_toolset=="target"', { + 'variables': { + 'm32flag': ' /dev/null 2>&1 < /dev/null) && echo "-m32" || true)', + 'clang%': 0, + }, 'conditions': [ - ['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', { - 'cflags': [ '-m32' ], - 'ldflags': [ '-m32' ], + ['((OS!="android" and OS!="qnx") or clang==1) and \ + nacl_target_arch!="nacl_x64"', { + 'cflags': [ '<(m32flag)' ], + 'ldflags': [ '<(m32flag)' ], }], ], 'xcode_settings': { @@ -484,35 +487,28 @@ }], ['(OS=="linux" or OS=="android") and \ (v8_target_arch=="x64" or v8_target_arch=="arm64")', { + # Check whether the host compiler and target compiler support the + # '-m64' option and set it if so. 'target_conditions': [ ['_toolset=="host"', { + 'variables': { + 'm64flag': ' /dev/null 2>&1 < /dev/null) && echo "-m64" || true)', + }, + 'cflags': [ '<(m64flag)' ], + 'ldflags': [ '<(m64flag)' ], + }], + ['_toolset=="target"', { + 'variables': { + 'm64flag': ' /dev/null 2>&1 < /dev/null) && echo "-m64" || true)', + }, 'conditions': [ - ['host_cxx_is_biarch==1', { - 'cflags': [ '-m64' ], - 'ldflags': [ '-m64' ] + ['((OS!="android" and OS!="qnx") or clang==1)', { + 'cflags': [ '<(m64flag)' ], + 'ldflags': [ '<(m64flag)' ], }], - ], - }], - ['_toolset=="target"', { - 'conditions': [ - ['target_cxx_is_biarch==1', { - 'cflags': [ '-m64' ], - 'ldflags': [ '-m64' ], - }], - ] - }], - ], - }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ - or OS=="netbsd" or OS=="qnx"', { - 'conditions': [ - [ 'v8_no_strict_aliasing==1', { - 'cflags': [ '-fno-strict-aliasing' ], - }], - ], # conditions - }], - ['OS=="solaris"', { - 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. + ], + }] + ], }], ['OS=="freebsd" or OS=="openbsd"', { 'cflags': [ '-I/usr/local/include' ], -- 2.7.4