From 2b76dca0fa86093d94e4f58f30ebcf357d64bbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sat, 19 Apr 2025 12:22:10 +0200 Subject: [PATCH] build: remove redundant `-mXX` flags for V8 They are already set by `common.gypi`. PR-URL: https://github.com/nodejs/node/pull/57907 Reviewed-By: James M Snell Reviewed-By: Marco Ippolito Reviewed-By: Chengzhong Wu Reviewed-By: Rafael Gonzaga Reviewed-By: Luigi Pinca --- tools/v8_gypfiles/toolchain.gypi | 91 -------------------------------- 1 file changed, 91 deletions(-) diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi index a5388783d9b..937f3f51976 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi @@ -97,33 +97,6 @@ # Indicates if gcmole tools are downloaded by a hook. 'gcmole%': 0, }, - - # [GYP] this needs to be outside of the top level 'variables' - 'conditions': [ - ['host_arch=="ia32" or host_arch=="x64" or \ - host_arch=="ppc64" or \ - host_arch=="s390x" 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=="ppc64" or \ - target_arch=="s390x" or clang==1', { - 'variables': { - 'target_cxx_is_biarch%': 1, - }, - }, { - 'variables': { - 'target_cxx_is_biarch%': 0, - }, - }], - ], 'target_defaults': { 'include_dirs': [ '<(V8_ROOT)', @@ -574,70 +547,6 @@ '-mmmx', # Allows mmintrin.h for MMX intrinsics. ], }], - ['(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")', { - 'target_conditions': [ - ['_toolset=="host"', { - 'conditions': [ - ['host_cxx_is_biarch==1', { - 'conditions': [ - ['host_arch=="s390x"', { - 'cflags': [ '-m31' ], - 'ldflags': [ '-m31' ] - },{ - 'cflags': [ '-m32' ], - 'ldflags': [ '-m32' ] - }], - ], - }], - ], - 'xcode_settings': { - 'ARCHS': [ 'i386' ], - }, - }], - ['_toolset=="target"', { - 'conditions': [ - ['target_cxx_is_biarch==1', { - 'conditions': [ - ['host_arch=="s390x"', { - 'cflags': [ '-m31' ], - 'ldflags': [ '-m31' ] - },{ - 'cflags': [ '-m32' ], - 'ldflags': [ '-m32' ], - }], - ], - }], - ], - 'xcode_settings': { - 'ARCHS': [ 'i386' ], - }, - }], - ], - }], - ['(OS=="linux" or OS=="android") and \ - (v8_target_arch=="x64" or v8_target_arch=="arm64" or \ - v8_target_arch=="ppc64" or v8_target_arch=="s390x")', { - 'target_conditions': [ - ['_toolset=="host"', { - 'conditions': [ - ['host_cxx_is_biarch==1', { - 'cflags': [ '-m64' ], - 'ldflags': [ '-m64' ] - }], - ], - }], - ['_toolset=="target"', { - 'conditions': [ - ['target_cxx_is_biarch==1', { - 'cflags': [ '-m64' ], - 'ldflags': [ '-m64' ], - }], - ] - }], - ], - }], ['OS=="android" and v8_android_log_stdout==1', { 'defines': [ 'V8_ANDROID_LOG_STDOUT',