From 45f2d83d3c7f887d946d8950bbfe59519d3e2412 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 30 Mar 2014 21:13:25 -0700
Subject: [PATCH 1/3] dist: Add libbacktrace to source tarballs

---
 mk/dist.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mk/dist.mk b/mk/dist.mk
index 93aedb2240d..297de1b2a23 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                            \

From 84e9c0692ab7b42fb3b25ab602a766c0e74a3c71 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 30 Mar 2014 21:23:43 -0700
Subject: [PATCH 2/3] mk: distcheck --uninstall

---
 mk/dist.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mk/dist.mk b/mk/dist.mk
index 297de1b2a23..2dbdf8064b7 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -248,6 +248,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
 

From d2686c751a45b18dd039dbca86c745dfa2c39f6b Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 31 Mar 2014 00:05:41 -0700
Subject: [PATCH 3/3] 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).
---
 mk/dist.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 2dbdf8064b7..8679aeed04f 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -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)
 
@@ -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
 
-distcheck: distcheck-tar-src distcheck-osx distcheck-tar-bins distcheck-docs
+dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins dist-docs
+
+distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins distcheck-docs
 	$(Q)rm -Rf tmp/distcheck
 	@echo
 	@echo -----------------------------------------------