Skip to content

Commit d2686c7

Browse files
committed
mk: Workaround distcheck failure on mac. #13224
Mac can't actually build our source tarballs because it's `tar` command doesn't support the --exclude-vcs flag. This is just a workaround to make our mac nightlies work (we get our source tarballs from the linux bot).
1 parent 84e9c06 commit d2686c7

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

mk/dist.mk

+13-2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ $(PKG_TAR): $(PKG_FILES)
7979
--exclude=*/llvm/test/*/*/*.td \
8080
--exclude=*/llvm/test/*/*/*.s \
8181
-c $(UNROOTED_PKG_FILES) | tar -x -C tmp/dist/$(PKG_NAME)
82+
@$(call E, making $@)
8283
$(Q)tar -czf $(PKG_TAR) -C tmp/dist $(PKG_NAME)
8384
$(Q)rm -Rf tmp/dist/$(PKG_NAME)
8485

@@ -282,9 +283,19 @@ distcheck: distcheck-win
282283

283284
else
284285

285-
dist: dist-tar-src dist-osx dist-tar-bins dist-docs
286+
# FIXME #13224: On OS X don't produce tarballs simply because --exclude-vcs don't work.
287+
# This is a huge hack because I just don't have time to figure out another solution.
288+
ifeq ($(CFG_OSTYPE), apple-darwin)
289+
MAYBE_DIST_TAR_SRC=
290+
MAYBE_DISTCHECK_TAR_SRC=
291+
else
292+
MAYBE_DIST_TAR_SRC=dist-tar-src
293+
MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src
294+
endif
295+
296+
dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins dist-docs
286297

287-
distcheck: distcheck-tar-src distcheck-osx distcheck-tar-bins distcheck-docs
298+
distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins distcheck-docs
288299
$(Q)rm -Rf tmp/distcheck
289300
@echo
290301
@echo -----------------------------------------------

0 commit comments

Comments
 (0)