diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-12-29 19:08:35 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-12-29 19:08:35 -0800 |
| commit | b12dfbb49124d6bae0fa6a4fdadde0bb1ba171cb (patch) | |
| tree | 98ad8ea6ab25df8194b65ed6ae9cfbd6c88e463e | |
| parent | 7628806997c4ace2dc334f4d88bfc0bf8adc583a (diff) | |
| download | rust-b12dfbb49124d6bae0fa6a4fdadde0bb1ba171cb.tar.gz rust-b12dfbb49124d6bae0fa6a4fdadde0bb1ba171cb.zip | |
Simplify some logic in dist.mk
| -rw-r--r-- | mk/dist.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 1fa1a85e55b..963627dbe09 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -314,14 +314,13 @@ ifdef CFG_WINDOWSY_$(CFG_BUILD) MAYBE_MINGW_TARBALLS=$(foreach host,$(CFG_HOST),dist/$(MINGW_PKG_NAME)-$(host).tar.gz) endif -ifneq ($(CFG_DISABLE_DOCS),) -dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).tar.gz) $(MAYBE_MINGW_TARBALLS) -else -dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).tar.gz) \ - $(foreach host,$(CFG_HOST),dist/$(DOC_PKG_NAME)-$(host).tar.gz) \ - $(MAYBE_MINGW_TARBALLS) +ifeq ($(CFG_DISABLE_DOCS),) +MAYBE_DOC_TARBALLS=$(foreach host,$(CFG_HOST),dist/$(DOC_PKG_NAME)-$(host).tar.gz) endif +dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).tar.gz) \ + $(MAYBE_DOC_TARBALLS) $(MAYBE_MINGW_TARBALLS) + # Just try to run the compiler for the build host distcheck-tar-bins: dist-tar-bins @$(call E, checking binary tarball) |