diff options
| author | Gibson Fahnestock <gib@uk.ibm.com> | 2016-03-31 18:23:42 +0100 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2016-04-19 22:48:15 -0400 |
| commit | 7fc4b31051bfef7bde65afc12941c28eabeabf2b (patch) | |
| tree | 94f1cc3d363ed9606b1d7551f06d550e50409fba /Makefile | |
| parent | 697790c1176bb4bb8062458c765fecc5e8a07646 (diff) | |
| download | android-node-v8-7fc4b31051bfef7bde65afc12941c28eabeabf2b.tar.gz android-node-v8-7fc4b31051bfef7bde65afc12941c28eabeabf2b.tar.bz2 android-node-v8-7fc4b31051bfef7bde65afc12941c28eabeabf2b.zip | |
build: fix make tar-headers for Linux
The tar-headers target tries to find and delete links in the
tar folder, which fails as no links are found. Use rm -f to
avoid this.
Remove the config.gypi dependency, as the target runs configure
itself.
PR-URL: https://github.com/nodejs/node/pull/5978
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -484,7 +484,7 @@ doc-upload: tar scp -pr out/doc/ $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs/ ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs.done" -$(TARBALL)-headers: config.gypi release-only +$(TARBALL)-headers: release-only $(PYTHON) ./configure \ --prefix=/ \ --dest-cpu=$(DESTCPU) \ @@ -492,7 +492,7 @@ $(TARBALL)-headers: config.gypi release-only --release-urlbase=$(RELEASE_URLBASE) \ $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '/' - find $(TARNAME)/ -type l | xargs rm # annoying on windows + find $(TARNAME)/ -type l | xargs rm -f tar -cf $(TARNAME)-headers.tar $(TARNAME) rm -rf $(TARNAME) gzip -c -f -9 $(TARNAME)-headers.tar > $(TARNAME)-headers.tar.gz @@ -658,4 +658,5 @@ endif blog blogclean tar binary release-only bench-http-simple bench-idle \ bench-all bench bench-misc bench-array bench-buffer bench-net \ bench-http bench-fs bench-tls cctest run-ci test-v8 test-v8-intl \ - test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci + test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci \ + $(TARBALL)-headers |