Auto merge of #24704 - brson:installer, r=alexcrichton

r? @alexcrichton
This commit is contained in:
bors 2015-04-23 07:56:17 +00:00
commit bd5c025df4
2 changed files with 11 additions and 2 deletions

11
configure vendored
View file

@ -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="$@"

@ -1 +1 @@
Subproject commit ebc6b04c29591108d3f28e724b4b9b74cd1232e6
Subproject commit e54d4823d26cdb3f98e5a1b17e1c257cd329aa61