Skip to content

Commit 7f3b973

Browse files
rvaggMayaLekova
authored andcommittedMay 8, 2018
Revert "tools: teach gyp to write an 'all deps' rule"
This reverts commit 920c132. Reverted along with d9b59de as this breaks compilation from downloadable source tarballs. Ref: nodejs#17407 PR-URL: nodejs#18287 Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 3a51908 commit 7f3b973

File tree

1 file changed

+0
-14
lines changed
  • tools/gyp/pylib/gyp/generator

1 file changed

+0
-14
lines changed
 

‎tools/gyp/pylib/gyp/generator/make.py

-14
Original file line numberDiff line numberDiff line change
@@ -2136,7 +2136,6 @@ def CalculateMakefilePath(build_file, base_name):
21362136
for target in gyp.common.AllTargets(target_list, target_dicts, build_file):
21372137
needed_targets.add(target)
21382138

2139-
all_deps = set()
21402139
build_files = set()
21412140
include_list = set()
21422141
for qualified_target in target_list:
@@ -2185,12 +2184,6 @@ def CalculateMakefilePath(build_file, base_name):
21852184
os.path.dirname(makefile_path))
21862185
include_list.add(mkfile_rel_path)
21872186

2188-
if 'actions' in spec:
2189-
for action in spec['actions']:
2190-
all_deps.update(map(writer.Absolutify, action['inputs']))
2191-
if 'sources' in spec:
2192-
all_deps.update(map(writer.Absolutify, spec['sources']))
2193-
21942187
# Write out per-gyp (sub-project) Makefiles.
21952188
depth_rel_path = gyp.common.RelativePath(options.depth, os.getcwd())
21962189
for build_file in build_files:
@@ -2234,10 +2227,3 @@ def CalculateMakefilePath(build_file, base_name):
22342227
root_makefile.write(SHARED_FOOTER)
22352228

22362229
root_makefile.close()
2237-
2238-
# Hack to get rid of $(obj)/path/to/foo.o deps that node.gyp adds manually.
2239-
all_deps = [s for s in all_deps if not '$' in s]
2240-
all_deps_path = os.path.join(options.toplevel_dir, '.deps')
2241-
with open(all_deps_path, 'w') as f:
2242-
f.write('ALL_DEPS := \\\n\t')
2243-
f.write(' \\\n\t'.join(sorted(all_deps)))

0 commit comments

Comments
 (0)
Please sign in to comment.