diff options
| author | bors <bors@rust-lang.org> | 2014-03-31 09:41:34 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-31 09:41:34 -0700 |
| commit | c821cacfed19d081fb5822b93f147e62e31e7931 (patch) | |
| tree | 3506d87c1d03de339035519646d78cf49f09ee85 | |
| parent | 1c2ccf0503b7a74e94c8e57136a0878c6bcf30df (diff) | |
| parent | d2686c751a45b18dd039dbca86c745dfa2c39f6b (diff) | |
auto merge of #13223 : brson/rust/dist, r=alexcrichton
| -rw-r--r-- | mk/dist.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 93aedb2240d..8679aeed04f 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -53,6 +53,7 @@ PKG_FILES := \ driver \ etc \ $(foreach crate,$(CRATES),lib$(crate)) \ + libbacktrace \ rt \ rustllvm \ snapshots.txt \ @@ -78,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) @@ -247,6 +249,7 @@ distcheck-tar-bins: dist-tar-bins $(Q)mkdir -p tmp/distcheck/tarbininstall $(Q)sh tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix=tmp/distcheck/tarbininstall $(Q)tmp/distcheck/tarbininstall/bin/rustc --version + $(Q)sh tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix=tmp/distcheck/tarbininstall --uninstall $(Q)rm -Rf tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD) $(Q)rm -Rf tmp/distcheck/tarbininstall @@ -280,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 ----------------------------------------------- |