1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: don't compile with -B, redux

Browse Source 
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: https://github.com/nodejs/node/issues/6603
PR-URL: https://github.com/nodejs/node/pull/6650
Refs: https://github.com/nodejs/node/pull/6393
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Ben Noordhuis 2016-05-09 13:47:09 +02:00
parent 844f0a9f58
commit 584f93aa0d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.gypi
View File

@ -25,9 +25,6 @@
# Don't bake anything extra into the snapshot. # Don't bake anything extra into the snapshot.
'v8_use_external_startup_data%': 0, 'v8_use_external_startup_data%': 0,
# Don't compile with -B, we don't bundle ld.gold.
'linux_use_bundled_gold%': 0,
'conditions': [ 'conditions': [
['OS == "win"', { ['OS == "win"', {
'os_posix': 0, 'os_posix': 0,

7
tools/gyp_node.py
View File

@ -56,5 +56,12 @@ if __name__ == '__main__':
args.append('-Dcomponent=static_library') args.append('-Dcomponent=static_library')
args.append('-Dlibrary=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) gyp_args = list(args)
run_gyp(gyp_args) run_gyp(gyp_args)