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

Revert "tools: teach gyp to write an 'all deps' rule"

Browse Source 
This reverts commit 920c13203df434278eb7c34a485e89734a5fa62a.

Reverted along with d9b59def7 as this breaks compilation from
downloadable source tarballs.

Ref: https://github.com/nodejs/node/pull/17407
PR-URL: https://github.com/nodejs/node/pull/18287
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Rod Vagg 2018-01-24 10:49:51 +11:00
parent 90f882e50d
commit fa9f31a4fd
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/gyp/pylib/gyp/generator/make.py
View File

@ -2136,7 +2136,6 @@ def GenerateOutput(target_list, target_dicts, data, params):
for target in gyp.common.AllTargets(target_list, target_dicts, build_file):
needed_targets.add(target)
all_deps = set()
build_files = set()
include_list = set()
for qualified_target in target_list:
@ -2185,12 +2184,6 @@ def GenerateOutput(target_list, target_dicts, data, params):
os.path.dirname(makefile_path))
include_list.add(mkfile_rel_path)
if 'actions' in spec:
for action in spec['actions']:
all_deps.update(map(writer.Absolutify, action['inputs']))
if 'sources' in spec:
all_deps.update(map(writer.Absolutify, spec['sources']))
# Write out per-gyp (sub-project) Makefiles.
depth_rel_path = gyp.common.RelativePath(options.depth, os.getcwd())
for build_file in build_files:
@ -2234,10 +2227,3 @@ def GenerateOutput(target_list, target_dicts, data, params):
root_makefile.write(SHARED_FOOTER)
root_makefile.close()
# Hack to get rid of $(obj)/path/to/foo.o deps that node.gyp adds manually.
all_deps = [s for s in all_deps if not '$' in s]
all_deps_path = os.path.join(options.toplevel_dir, '.deps')
with open(all_deps_path, 'w') as f:
f.write('ALL_DEPS := \\\n\t')
f.write(' \\\n\t'.join(sorted(all_deps)))