mirror of
https://github.com/nodejs/node.git
synced 2024-11-29 23:16:30 +01:00
584f93aa0d
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>
68 lines
2.2 KiB
Python
Executable File
68 lines
2.2 KiB
Python
Executable File
#!/usr/bin/env python
|
|
import os
|
|
import sys
|
|
|
|
script_dir = os.path.dirname(__file__)
|
|
node_root = os.path.normpath(os.path.join(script_dir, os.pardir))
|
|
|
|
sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib'))
|
|
import gyp
|
|
|
|
# Directory within which we want all generated files (including Makefiles)
|
|
# to be written.
|
|
output_dir = os.path.join(os.path.abspath(node_root), 'out')
|
|
|
|
def run_gyp(args):
|
|
rc = gyp.main(args)
|
|
if rc != 0:
|
|
print 'Error running GYP'
|
|
sys.exit(rc)
|
|
|
|
if __name__ == '__main__':
|
|
args = sys.argv[1:]
|
|
|
|
# GYP bug.
|
|
# On msvs it will crash if it gets an absolute path.
|
|
# On Mac/make it will crash if it doesn't get an absolute path.
|
|
if sys.platform == 'win32':
|
|
args.append(os.path.join(node_root, 'node.gyp'))
|
|
common_fn = os.path.join(node_root, 'common.gypi')
|
|
options_fn = os.path.join(node_root, 'config.gypi')
|
|
options_fips_fn = os.path.join(node_root, 'config_fips.gypi')
|
|
else:
|
|
args.append(os.path.join(os.path.abspath(node_root), 'node.gyp'))
|
|
common_fn = os.path.join(os.path.abspath(node_root), 'common.gypi')
|
|
options_fn = os.path.join(os.path.abspath(node_root), 'config.gypi')
|
|
options_fips_fn = os.path.join(os.path.abspath(node_root), 'config_fips.gypi')
|
|
|
|
if os.path.exists(common_fn):
|
|
args.extend(['-I', common_fn])
|
|
|
|
if os.path.exists(options_fn):
|
|
args.extend(['-I', options_fn])
|
|
|
|
if os.path.exists(options_fips_fn):
|
|
args.extend(['-I', options_fips_fn])
|
|
|
|
args.append('--depth=' + node_root)
|
|
|
|
# There's a bug with windows which doesn't allow this feature.
|
|
if sys.platform != 'win32' and 'ninja' not in args:
|
|
# Tell gyp to write the Makefiles into output_dir
|
|
args.extend(['--generator-output', output_dir])
|
|
|
|
# Tell make to write its output into the same dir
|
|
args.extend(['-Goutput_dir=' + output_dir])
|
|
|
|
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)
|