Skip to content

Commit

Permalink
Revert "tools: teach gyp to write an 'all deps' rule"
Browse files Browse the repository at this point in the history
This reverts commit 920c132.

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

Ref: #17407
PR-URL: #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>
  • Loading branch information
rvagg committed Jan 24, 2018
1 parent 90f882e commit fa9f31a
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions tools/gyp/pylib/gyp/generator/make.py
Expand Up @@ -2136,7 +2136,6 @@ def CalculateMakefilePath(build_file, base_name):
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:
Expand Down Expand Up @@ -2185,12 +2184,6 @@ def CalculateMakefilePath(build_file, base_name):
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:
Expand Down Expand Up @@ -2234,10 +2227,3 @@ def CalculateMakefilePath(build_file, base_name):
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)))

0 comments on commit fa9f31a

Please sign in to comment.