diff options
| author | bors <bors@rust-lang.org> | 2014-09-30 12:27:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-30 12:27:27 +0000 |
| commit | 38015eeb7010e5954a1bc60fddc1214a5f359627 (patch) | |
| tree | abb52be267ac04a2f568714ecfe65e5547c8883f | |
| parent | d2f8d4c5050be01923f28308b71ad14a2776b30e (diff) | |
| parent | 887da8d33a81865c2841751f3106fb8607a31b26 (diff) | |
| download | rust-38015eeb7010e5954a1bc60fddc1214a5f359627.tar.gz rust-38015eeb7010e5954a1bc60fddc1214a5f359627.zip | |
auto merge of #17640 : brson/rust/wininst, r=alexcrichton
This makes the windows `make dist` target start producing binary tarballs, and tweaks install.sh so they work, in preparation for working on a combined Rust+Cargo installer.
| -rw-r--r-- | mk/dist.mk | 2 | ||||
| -rw-r--r-- | src/etc/install.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 26169f3a13b..4d82857ecea 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -283,7 +283,7 @@ distcheck-docs: dist-docs ifdef CFG_WINDOWSY_$(CFG_BUILD) -dist: dist-win +dist: dist-win dist-tar-bins distcheck: distcheck-win $(Q)rm -Rf tmp/distcheck diff --git a/src/etc/install.sh b/src/etc/install.sh index c949743ea75..4f43b1ed130 100644 --- a/src/etc/install.sh +++ b/src/etc/install.sh @@ -325,7 +325,7 @@ then if [ -z "${CFG_UNINSTALL}" ] then msg "verifying platform can run binaries" - export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib":$CFG_OLD_LD_PATH_VAR + export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib:$CFG_OLD_LD_PATH_VAR" "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null if [ $? -ne 0 ] then @@ -489,7 +489,7 @@ then "${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null if [ $? -ne 0 ] then - export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib":$CFG_OLD_LD_PATH_VAR + export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib:$CFG_OLD_LD_PATH_VAR" "${CFG_PREFIX}/bin/rustc" --version > /dev/null if [ $? -ne 0 ] then |