diff options
| author | Rod Vagg <rod@vagg.org> | 2018-01-24 10:49:51 +1100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2018-01-25 08:18:42 +1100 |
| commit | fa9f31a4fda5a3782c652e56e394465805ebb50f (patch) | |
| tree | a6f9ee9ceab470406892026f07837b6296b388db /tools/gyp | |
| parent | 90f882e50d4040c44b33ec33e2e1c15302da1276 (diff) | |
| download | android-node-v8-fa9f31a4fda5a3782c652e56e394465805ebb50f.tar.gz android-node-v8-fa9f31a4fda5a3782c652e56e394465805ebb50f.tar.bz2 android-node-v8-fa9f31a4fda5a3782c652e56e394465805ebb50f.zip | |
Revert "tools: teach gyp to write an 'all deps' rule"
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>
Diffstat (limited to 'tools/gyp')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index eaf02ae734..f7f519b3e6 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -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))) |