diff options
| author | bors <bors@rust-lang.org> | 2015-05-23 08:01:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-23 08:01:08 +0000 |
| commit | f472403650e3f321b2dea893d890929af309695b (patch) | |
| tree | 9a4cd6d2c7f310929930d18aa1d9e0738ff172be | |
| parent | 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193 (diff) | |
| parent | e90959e58bdf1a3685836987f85baf206b93fcf9 (diff) | |
| download | rust-f472403650e3f321b2dea893d890929af309695b.tar.gz rust-f472403650e3f321b2dea893d890929af309695b.zip | |
Auto merge of #25717 - brson:compiler-docs, r=pnkfelix
The install target depends on compiler-docs but 'all' does not. This means that running 'make && make install' will run additional doc builds and tests during installation, which hides bugs in the build. For now this just unconditionally stops building compiler docs.
| -rw-r--r-- | mk/dist.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 9aab51daba9..0fc9100b85b 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -123,7 +123,7 @@ dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) dist-install-dir-$(1): PREPARE_CLEAN=true -dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs +dist-install-dir-$(1): prepare-base-dir-$(1) docs $$(Q)mkdir -p $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)/share/doc/rust @@ -163,7 +163,7 @@ endif --legacy-manifest-dirs=rustlib,cargo $$(Q)rm -R tmp/dist/$$(PKG_NAME)-$(1)-image -dist-doc-install-dir-$(1): docs compiler-docs +dist-doc-install-dir-$(1): docs $$(Q)mkdir -p tmp/dist/$$(DOC_PKG_NAME)-$(1)-image/share/doc/rust $$(Q)cp -r doc tmp/dist/$$(DOC_PKG_NAME)-$(1)-image/share/doc/rust/html @@ -251,7 +251,7 @@ distcheck-tar-bins: dist-tar-bins # Just copy the docs to a folder under dist with the appropriate name # for uploading to S3 -dist-docs: docs compiler-docs +dist-docs: docs $(Q) rm -Rf dist/doc $(Q) mkdir -p dist/doc/ $(Q) cp -r doc dist/doc/$(CFG_PACKAGE_VERS) |