From 7fc4b31051bfef7bde65afc12941c28eabeabf2b Mon Sep 17 00:00:00 2001 From: Gibson Fahnestock Date: Thu, 31 Mar 2016 18:23:42 +0100 Subject: [PATCH] build: fix make tar-headers for Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-By: Ben Noordhuis Reviewed-By: Johan Bergström Reviewed-By: Michael Dawson Reviewed-By: James M Snell --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1edbb78929..bf0c59a5f5 100644 --- a/Makefile +++ b/Makefile @@ -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