Skip to content

Commit 7fc4b31

Browse files
gibfahnmhdawson
authored andcommitted
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: #5978 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Johan Bergström <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 697790c commit 7fc4b31

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Diff for: Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -484,15 +484,15 @@ doc-upload: tar
484484
scp -pr out/doc/ $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs/
485485
ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs.done"
486486

487-
$(TARBALL)-headers: config.gypi release-only
487+
$(TARBALL)-headers: release-only
488488
$(PYTHON) ./configure \
489489
--prefix=/ \
490490
--dest-cpu=$(DESTCPU) \
491491
--tag=$(TAG) \
492492
--release-urlbase=$(RELEASE_URLBASE) \
493493
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
494494
HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '/'
495-
find $(TARNAME)/ -type l | xargs rm # annoying on windows
495+
find $(TARNAME)/ -type l | xargs rm -f
496496
tar -cf $(TARNAME)-headers.tar $(TARNAME)
497497
rm -rf $(TARNAME)
498498
gzip -c -f -9 $(TARNAME)-headers.tar > $(TARNAME)-headers.tar.gz
@@ -658,4 +658,5 @@ endif
658658
blog blogclean tar binary release-only bench-http-simple bench-idle \
659659
bench-all bench bench-misc bench-array bench-buffer bench-net \
660660
bench-http bench-fs bench-tls cctest run-ci test-v8 test-v8-intl \
661-
test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci
661+
test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci \
662+
$(TARBALL)-headers

0 commit comments

Comments
 (0)