Skip to content

Commit

Permalink
build: don't compile with -B, redux
Browse files Browse the repository at this point in the history
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: nodejs#6603
PR-URL: nodejs#6650
Refs: nodejs#6393
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
bnoordhuis committed May 10, 2016
1 parent 844f0a9 commit 584f93a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 0 additions & 3 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 7 additions & 0 deletions tools/gyp_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 584f93a

Please sign in to comment.