Skip to content

Commit bd12d72

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 <[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 4e4efb7 commit bd12d72

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
@@ -473,15 +473,15 @@ doc-upload: tar
473473
scp -pr out/doc/ $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs/
474474
ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs.done"
475475

476-
$(TARBALL)-headers: config.gypi release-only
476+
$(TARBALL)-headers: release-only
477477
$(PYTHON) ./configure \
478478
--prefix=/ \
479479
--dest-cpu=$(DESTCPU) \
480480
--tag=$(TAG) \
481481
--release-urlbase=$(RELEASE_URLBASE) \
482482
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
483483
HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '/'
484-
find $(TARNAME)/ -type l | xargs rm # annoying on windows
484+
find $(TARNAME)/ -type l | xargs rm -f
485485
tar -cf $(TARNAME)-headers.tar $(TARNAME)
486486
rm -rf $(TARNAME)
487487
gzip -c -f -9 $(TARNAME)-headers.tar > $(TARNAME)-headers.tar.gz
@@ -638,4 +638,5 @@ lint-ci: jslint-ci cpplint
638638
blog blogclean tar binary release-only bench-http-simple bench-idle \
639639
bench-all bench bench-misc bench-array bench-buffer bench-net \
640640
bench-http bench-fs bench-tls cctest run-ci test-v8 test-v8-intl \
641-
test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci
641+
test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci \
642+
$(TARBALL)-headers

0 commit comments

Comments
 (0)