diff options
| author | bors <bors@rust-lang.org> | 2015-04-23 07:56:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-23 07:56:17 +0000 |
| commit | bd5c025df40b54b3bc5a4f1a111cce4033d3359e (patch) | |
| tree | 0dc7cf880d5622ebf32d9c957d5353d133225a2f | |
| parent | 2a6224252c0481f2ab7aa5bd30e134f9b31bb0a2 (diff) | |
| parent | 0c196fd44c08a184bffb37b91cb538d5d3ebd330 (diff) | |
| download | rust-bd5c025df40b54b3bc5a4f1a111cce4033d3359e.tar.gz rust-bd5c025df40b54b3bc5a4f1a111cce4033d3359e.zip | |
Auto merge of #24704 - brson:installer, r=alexcrichton
r? @alexcrichton
| -rwxr-xr-x | configure | 11 | ||||
| m--------- | src/rust-installer | 0 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure b/configure index 18fef588936..fc8d57999ff 100755 --- a/configure +++ b/configure @@ -337,6 +337,15 @@ to_gnu_triple() { esac } +# Prints the absolute path of a directory to stdout +abs_path() { + local _path="$1" + # Unset CDPATH because it causes havok: it makes the destination unpredictable + # and triggers 'cd' to print the path to stdout. Route `cd`'s output to /dev/null + # for good measure. + (unset CDPATH && cd "$_path" > /dev/null && pwd) +} + msg "looking for configure programs" need_cmd cmp need_cmd mkdir @@ -509,7 +518,7 @@ fi DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}" -CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/" +CFG_SRC_DIR="$(abs_path $(dirname $0))/" CFG_BUILD_DIR="$(pwd)/" CFG_SELF="$0" CFG_CONFIGURE_ARGS="$@" diff --git a/src/rust-installer b/src/rust-installer -Subproject ebc6b04c29591108d3f28e724b4b9b74cd1232e +Subproject e54d4823d26cdb3f98e5a1b17e1c257cd329aa6 |