about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-06 18:04:13 +0000
committerbors <bors@rust-lang.org>2017-11-06 18:04:13 +0000
commitdbe8055f5a23b3cee27058b828364bb280c86d12 (patch)
treed79d01d504133cf458e8c43d025d6f49c77f5f8c /src/rustllvm/RustWrapper.cpp
parent58557fafae060c500394d5df13cd0cf68170903e (diff)
parent32cf6e64c1c0437521fa13faff6359e435e490ef (diff)
downloadrust-dbe8055f5a23b3cee27058b828364bb280c86d12.tar.gz
rust-dbe8055f5a23b3cee27058b828364bb280c86d12.zip
Auto merge of #45322 - infinity0:master, r=alexcrichton
When cross-compiling, also build target-arch tarballs for libstd. (Closes: #42320)

Half of the logic is actually in there already in install.rs:install_std but it fails with an error like:

sh: 0: Can't open /<<BUILDDIR>>/rustc-1.21.0+dfsg1/build/tmp/dist/rust-std-1.21.0-powerpc64le-unknown-linux-gnu/install.sh

because the target-arch dist tarball wasn't built as well. This commit fixes that so the overall install works.

There is one minor bug in the existing code which this commit doesn't fix - the install.log from multiple runs of the installer gets clobbered, which seems like it might interfere with the uninstall process (I didn't look very deeply into this, because it doesn't affect what I need to do.) The actual installed files under DESTDIR seem fine though - either they are installed under an arch-specific path, or the multiple runs will clobber the same path with the same arch-independent file.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions