Skip to content

Commit a01caa3

Browse files
bnoordhuisMyles Borins
authored and
Myles Borins
committed
build: don't compile with -B, redux
It looks like suppressing `-B` and `-fuse-ld=gold` from common.gypi is not very reliable. I'm positive it worked when commit 3cdb506 ("build: don't compile with -B") was merged but subsequent updates appear to have broken it again. Take the nuclear option and disable them from `tools/node_gyp.py`. Fixes: #6603 PR-URL: #6650 Refs: #6393 Reviewed-By: Anna Henningsen <[email protected]>
1 parent 37606ca commit a01caa3

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

common.gypi

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
# Don't bake anything extra into the snapshot.
2626
'v8_use_external_startup_data%': 0,
2727

28-
# Don't compile with -B, we don't bundle ld.gold.
29-
'linux_use_bundled_gold%': 0,
30-
3128
'conditions': [
3229
['OS == "win"', {
3330
'os_posix': 0,

tools/gyp_node.py

+7
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,12 @@ def run_gyp(args):
5656

5757
args.append('-Dcomponent=static_library')
5858
args.append('-Dlibrary=static_library')
59+
60+
# Don't compile with -B and -fuse-ld=, we don't bundle ld.gold. Can't be
61+
# set in common.gypi due to how deps/v8/build/toolchain.gypi uses them.
62+
args.append('-Dlinux_use_bundled_binutils=0')
63+
args.append('-Dlinux_use_bundled_gold=0')
64+
args.append('-Dlinux_use_gold_flags=0')
65+
5966
gyp_args = list(args)
6067
run_gyp(gyp_args)

0 commit comments

Comments
 (0)