Skip to content

Commit 292b1b7

Browse files
gibfahnMyles Borins
authored and
Myles Borins
committed
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 <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>
1 parent 4c73ab4 commit 292b1b7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

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

402-
$(TARBALL)-headers: config.gypi release-only
402+
$(TARBALL)-headers: release-only
403403
$(PYTHON) ./configure \
404404
--prefix=/ \
405405
--dest-cpu=$(DESTCPU) \
406406
--tag=$(TAG) \
407407
--release-urlbase=$(RELEASE_URLBASE) \
408408
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
409409
HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '/'
410-
find $(TARNAME)/ -type l | xargs rm # annoying on windows
410+
find $(TARNAME)/ -type l | xargs rm -f
411411
tar -cf $(TARNAME)-headers.tar $(TARNAME)
412412
rm -rf $(TARNAME)
413413
gzip -c -f -9 $(TARNAME)-headers.tar > $(TARNAME)-headers.tar.gz
@@ -556,4 +556,5 @@ lint-ci: lint
556556
dynamiclib test test-all test-addons build-addons website-upload pkg \
557557
blog blogclean tar binary release-only bench-http-simple bench-idle \
558558
bench-all bench bench-misc bench-array bench-buffer bench-net \
559-
bench-http bench-fs bench-tls cctest run-ci lint-ci bench-ci
559+
bench-http bench-fs bench-tls cctest run-ci lint-ci bench-ci \
560+
$(TARBALL)-headers

0 commit comments

Comments
 (0)