mirror of
https://github.com/nodejs/node.git
synced 2025-05-09 07:27:32 +00:00

Currently, after having configured and built node and then updating a dependent target the following error is produced when trying to rebuild the project: $ ./configure && make -j8 $ touch node.gypi $ make -j8 configure: error: no such option: -f make[1]: *** [Makefile:685: Makefile] Error 2 The reason for this is that the target 'cmd_regen_makefile' is using the command 'configure' instead of 'gyp_node.py' in out/Makefile: cmd_regen_makefile = cd $(srcdir); /work/nodejs/node/configure -fmake As far as I can tell gyp is using sys.argv[0] as the 'gyp_binary' in __init__.py: params = {'options': options, ... 'gyp_binary': sys.argv[0], But when called via 'configure' sys.argv[0] is 'configure' instead of gyp_node.py leading to the above error. This commit suggests setting the program name explicitly in gyp_node.py. Alternatively perhaps this could be done in configure.py instead but I was not sure what would be best. PR-URL: https://github.com/nodejs/node/pull/34255 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
68 lines
2.3 KiB
Python
Executable File
68 lines
2.3 KiB
Python
Executable File
#!/usr/bin/env python
|
|
from __future__ import print_function
|
|
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):
|
|
# 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.
|
|
a_path = node_root if sys.platform == 'win32' else os.path.abspath(node_root)
|
|
args.append(os.path.join(a_path, 'node.gyp'))
|
|
common_fn = os.path.join(a_path, 'common.gypi')
|
|
options_fn = os.path.join(a_path, 'config.gypi')
|
|
options_fips_fn = os.path.join(a_path, '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')
|
|
|
|
# Set the current program to this module. This is done because gyp
|
|
# will use the program path in targets it generates. If this script was called
|
|
# by another script the program name will not be gyp_node.py but whatever
|
|
# the name of the script that called it is, leading to incorrect commands
|
|
# in generated targets (for example cmd_regen_makefile).
|
|
sys.argv[0] = os.path.abspath(__file__)
|
|
rc = gyp.main(args)
|
|
if rc != 0:
|
|
print('Error running GYP')
|
|
sys.exit(rc)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
run_gyp(sys.argv[1:])
|