diff options
| author | bors <bors@rust-lang.org> | 2013-11-21 08:26:50 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-21 08:26:50 -0800 |
| commit | 8464004c7692a79d2df375d3c249da27548dc370 (patch) | |
| tree | b136fd1a5b809a1b1a303129c92ba6477721eb92 | |
| parent | 85a1eff3a99c5d60bf34ca6f08f87ed341329af0 (diff) | |
| parent | 11b6aed4a5ee3f0a7b2dc6dbc48c1d84ee23f80a (diff) | |
| download | rust-8464004c7692a79d2df375d3c249da27548dc370.tar.gz rust-8464004c7692a79d2df375d3c249da27548dc370.zip | |
auto merge of #10584 : klutzy/rust/local-rust-root, r=alexcrichton
Fixes #8756.
| -rwxr-xr-x | configure | 12 | ||||
| -rwxr-xr-x | src/etc/local_stage0.sh | 21 |
2 files changed, 20 insertions, 13 deletions
diff --git a/configure b/configure index ff1b47647a6..f81072ad691 100755 --- a/configure +++ b/configure @@ -520,14 +520,20 @@ then fi fi +BIN_SUF= +if [ $CFG_OSTYPE = "pc-mingw32" ] +then + BIN_SUF=.exe +fi + if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ] then - if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc ] + if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ] then err "no local rust to use" else - LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc --version` - step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: " $LRV + LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} --version` + step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV" fi fi diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh index 3b70f9b967f..af9f570a8b0 100755 --- a/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh @@ -3,8 +3,8 @@ TARG_DIR=$1 PREFIX=$2 -BINDIR=bin -LIBDIR=lib +LIB_DIR=lib +LIB_PREFIX=lib OS=`uname -s` case $OS in @@ -21,7 +21,8 @@ case $OS in (*) BIN_SUF=.exe LIB_SUF=.dll - LIBDIR=bin + LIB_DIR=bin + LIB_PREFIX= break ;; esac @@ -31,7 +32,7 @@ if [ -z $PREFIX ]; then exit 1 fi -if [ ! -e ${PREFIX}/bin/rustc ]; then +if [ ! -e ${PREFIX}/bin/rustc${BIN_SUF} ]; then echo "No local rust installed at ${PREFIX}" exit 1 fi @@ -41,9 +42,9 @@ if [ -z $TARG_DIR ]; then exit 1 fi -cp ${PREFIX}/bin/rustc ${TARG_DIR}/stage0/bin/ -cp ${PREFIX}/lib/rustc/${TARG_DIR}/${LIBDIR}/* ${TARG_DIR}/stage0/${LIBDIR}/ -cp ${PREFIX}/lib/libextra*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ -cp ${PREFIX}/lib/librust*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ -cp ${PREFIX}/lib/libstd*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ -cp ${PREFIX}/lib/libsyntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ +cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ +cp ${PREFIX}/${LIB_DIR}/rustc/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ |