Skip to content

build: don't compile with -B, redux #6650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 1 commit into from
May 10, 2016
Merged

build: don't compile with -B, redux #6650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <anna@addaleax.net>
  • Loading branch information
@bnoordhuis
bnoordhuis committed May 10, 2016
commit 584f93aa0d4abc7b09e3573bfbf392704e42a899
3 changes: 0 additions & 3 deletions common.gypi
View file
Open in desktop
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
View file
Open in desktop
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)