mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 16:24:46 +00:00
Bugfixes and cleanup to configure script
This commit is contained in:
parent
62f1d68439
commit
99746d43c1
11
configure
vendored
11
configure
vendored
@ -22,7 +22,7 @@ err() {
|
|||||||
need_ok() {
|
need_ok() {
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
then
|
||||||
err $1
|
err "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,7 +340,7 @@ DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}"
|
|||||||
|
|
||||||
CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
|
CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
|
||||||
CFG_BUILD_DIR="$(pwd)/"
|
CFG_BUILD_DIR="$(pwd)/"
|
||||||
CFG_SELF=${CFG_SRC_DIR}$(basename $0)
|
CFG_SELF="$0"
|
||||||
CFG_CONFIGURE_ARGS="$@"
|
CFG_CONFIGURE_ARGS="$@"
|
||||||
|
|
||||||
OPTIONS=""
|
OPTIONS=""
|
||||||
@ -412,16 +412,15 @@ fi
|
|||||||
valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
|
valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
|
||||||
valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
|
valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
|
||||||
|
|
||||||
# Validate Options
|
|
||||||
step_msg "validating $CFG_SELF args"
|
|
||||||
validate_opt
|
|
||||||
|
|
||||||
if [ $HELP -eq 1 ]
|
if [ $HELP -eq 1 ]
|
||||||
then
|
then
|
||||||
echo
|
echo
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Validate Options
|
||||||
|
step_msg "validating $CFG_SELF args"
|
||||||
|
validate_opt
|
||||||
|
|
||||||
step_msg "looking for build programs"
|
step_msg "looking for build programs"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user