Skip to content

Commit 38015ee

Browse files
committed
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.
2 parents d2f8d4c + 887da8d commit 38015ee

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mk/dist.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ distcheck-docs: dist-docs
283283

284284
ifdef CFG_WINDOWSY_$(CFG_BUILD)
285285

286-
dist: dist-win
286+
dist: dist-win dist-tar-bins
287287

288288
distcheck: distcheck-win
289289
$(Q)rm -Rf tmp/distcheck

src/etc/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ then
325325
if [ -z "${CFG_UNINSTALL}" ]
326326
then
327327
msg "verifying platform can run binaries"
328-
export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib":$CFG_OLD_LD_PATH_VAR
328+
export $CFG_LD_PATH_VAR="${CFG_SRC_DIR}/lib:$CFG_OLD_LD_PATH_VAR"
329329
"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
330330
if [ $? -ne 0 ]
331331
then
@@ -489,7 +489,7 @@ then
489489
"${CFG_PREFIX}/bin/rustc" --version 2> /dev/null 1> /dev/null
490490
if [ $? -ne 0 ]
491491
then
492-
export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib":$CFG_OLD_LD_PATH_VAR
492+
export $CFG_LD_PATH_VAR="${CFG_PREFIX}/lib:$CFG_OLD_LD_PATH_VAR"
493493
"${CFG_PREFIX}/bin/rustc" --version > /dev/null
494494
if [ $? -ne 0 ]
495495
then

0 commit comments

Comments
 (0)