diff --git a/common.gypi b/common.gypi index 10da7abccc447c..8da603d00f618e 100644 --- a/common.gypi +++ b/common.gypi @@ -25,9 +25,6 @@ # Don't bake anything extra into the snapshot. 'v8_use_external_startup_data%': 0, - # Don't compile with -B, we don't bundle ld.gold. - 'linux_use_bundled_gold%': 0, - 'conditions': [ ['OS == "win"', { 'os_posix': 0, diff --git a/tools/gyp_node.py b/tools/gyp_node.py index 0ceb93341f12d3..8de046aae259f1 100755 --- a/tools/gyp_node.py +++ b/tools/gyp_node.py @@ -56,5 +56,12 @@ def run_gyp(args): args.append('-Dcomponent=static_library') args.append('-Dlibrary=static_library') + + # Don't compile with -B and -fuse-ld=, we don't bundle ld.gold. Can't be + # set in common.gypi due to how deps/v8/build/toolchain.gypi uses them. + args.append('-Dlinux_use_bundled_binutils=0') + args.append('-Dlinux_use_bundled_gold=0') + args.append('-Dlinux_use_gold_flags=0') + gyp_args = list(args) run_gyp(gyp_args)