Skip to content

Commit

Permalink
mk: Workaround distcheck failure on mac. #13224
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
brson committed Mar 31, 2014
1 parent 84e9c06 commit d2686c7
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions mk/dist.mk
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ $(PKG_TAR): $(PKG_FILES)
--exclude=*/llvm/test/*/*/*.td \
--exclude=*/llvm/test/*/*/*.s \
-c $(UNROOTED_PKG_FILES) | tar -x -C tmp/dist/$(PKG_NAME)
@$(call E, making $@)
$(Q)tar -czf $(PKG_TAR) -C tmp/dist $(PKG_NAME)
$(Q)rm -Rf tmp/dist/$(PKG_NAME)

Expand Down Expand Up @@ -282,9 +283,19 @@ distcheck: distcheck-win

else

dist: dist-tar-src dist-osx dist-tar-bins dist-docs
# FIXME #13224: On OS X don't produce tarballs simply because --exclude-vcs don't work.
# This is a huge hack because I just don't have time to figure out another solution.
ifeq ($(CFG_OSTYPE), apple-darwin)
MAYBE_DIST_TAR_SRC=
MAYBE_DISTCHECK_TAR_SRC=
else
MAYBE_DIST_TAR_SRC=dist-tar-src
MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src
endif

dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins dist-docs

distcheck: distcheck-tar-src distcheck-osx distcheck-tar-bins distcheck-docs
distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins distcheck-docs
$(Q)rm -Rf tmp/distcheck
@echo
@echo -----------------------------------------------
Expand Down

9 comments on commit d2686c7

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@d2686c7

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/dist = d2686c7 into auto

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/dist = d2686c7 merged ok, testing candidate = 9073586

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@d2686c7

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/dist = d2686c7 into auto

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/dist = d2686c7 merged ok, testing candidate = c821cac

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on d2686c7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = c821cac

Please sign in to comment.