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.
This commit is contained in:
commit
38015eeb70
|
@ -283,7 +283,7 @@ distcheck-docs: dist-docs
|
||||||
|
|
||||||
ifdef CFG_WINDOWSY_$(CFG_BUILD)
|
ifdef CFG_WINDOWSY_$(CFG_BUILD)
|
||||||
|
|
||||||
dist: dist-win
|
dist: dist-win dist-tar-bins
|
||||||
|
|
||||||
distcheck: distcheck-win
|
distcheck: distcheck-win
|
||||||
$(Q)rm -Rf tmp/distcheck
|
$(Q)rm -Rf tmp/distcheck
|
||||||
|
|
|
@ -325,7 +325,7 @@ then
|
||||||
if [ -z "${CFG_UNINSTALL}" ]
|
if [ -z "${CFG_UNINSTALL}" ]
|
||||||
then
|
then
|
||||||
msg "verifying platform can run binaries"
|
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
|
"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
then
|
||||||
|
@ -489,7 +489,7 @@ then
|
||||||
"${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null
|
"${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
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
|
"${CFG_PREFIX}/bin/rustc" --version > /dev/null
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue