Fix make install dependencies
#20437
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @huonw (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see CONTRIBUTING.md for more information. |
This distributes docs in a separate package called rust-docs. The rust-packaging project will combine it with Rust and Cargo into a single installer in a variety of formats.
|
Also fixed by #20380, but this version's a bit cleaner. It looks like that other PR will land, so this may need a rebase. |
|
(it was merged) |
After 8b3c676 the `make install` command fails if docs are not disabled through CFG_DISABLE_DOCS, because now the `install` target uses ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh In 714a2c6 the `prepare_install` target wwas changed to conditionally depend also on the doc archive, but did not modify `prepare_uninstall`. Instead of explicitly depending on dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz, the `prepare_[un]install` targets now depend on `dist-tar-bins`, which packages the appropriate dist archives depending on the configuration.
ranma42
force-pushed
the
fix-make-install
branch
from
ab850cd to
f2ee9fc
Compare
|
Rebased and updated commit message with a reference to the previous fix and why this might be preferred ( |
After 8b3c676 the `make install` command fails if docs are not disabled through CFG_DISABLE_DOCS, because now the `install` target uses ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh Instead of explicitly depending on dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz, the `prepare_[un]install` targets now depend on `dist-tar-bins`, which packages the appropriate dist archives depending on the configuration.
After 8b3c676 the
make installcommand fails if docs are not disabled through CFG_DISABLE_DOCS,
because now the
installtarget uses../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh
Instead of explicitly depending on
dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz, the
prepare_[un]installtargets now depend on
dist-tar-bins, which packages the appropriatedist archives depending on the configuration.