---

yaml
---
r: 150422
b: refs/heads/try2
c: d2686c7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 84e9c0692ab7b42fb3b25ab602a766c0e74a3c71
+refs/heads/try2: d2686c751a45b18dd039dbca86c745dfa2c39f6b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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
+
+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 -----------------------------------------------