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>
This commit is contained in:
parent
697790c117
commit
7fc4b31051
7
Makefile
7
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user