OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidy up redundant code in configure relating to valopt and triples.

Browse Source
This commit is contained in:
Graydon Hoare 2012-01-30 16:29:13 -08:00
parent fe745f1b5d
commit 3a5c75eff9
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@ -267,8 +267,8 @@ opt mingw-cross 0 "cross-compile for win32 using mingw"
opt clang 0 "prefer clang to gcc for building the runtime" opt clang 0 "prefer clang to gcc for building the runtime"
valopt prefix "/usr/local" "set installation prefix" valopt prefix "/usr/local" "set installation prefix"
valopt llvm-root "" "set LLVM root" valopt llvm-root "" "set LLVM root"
valopt host-triple "$DEFAULT_HOST_TRIPLE" "primary LLVM host triple" valopt host-triple "${DEFAULT_HOST_TRIPLE}" "LLVM host triple"
valopt target-triples "" "LLVM target triples (defaults to host if unset)" valopt target-triples "${CFG_HOST_TRIPLE}" "LLVM target triples"
if [ $HELP -eq 1 ] if [ $HELP -eq 1 ]
then then
@ -356,23 +356,10 @@ else
CFG_C_COMPILER="gcc" CFG_C_COMPILER="gcc"
fi fi
if [ -z "$CFG_PREFIX" ] # a little post-processing of various config values
then
CFG_PREFIX=/usr/local
fi
if [ -z "$CFG_HOST_TRIPLE" ]
then
CFG_HOST_TRIPLE="$DEFAULT_HOST_TRIPLE"
fi
if [ -z "$CFG_TARGET_TRIPLES" ]
then
CFG_TARGET_TRIPLES="${CFG_HOST_TRIPLE}"
else
CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
fi
CFG_PREFIX=${CFG_PREFIX%/}
CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
case $CFG_TARGET_TRIPLES in case $CFG_TARGET_TRIPLES in
(*$CFG_HOST_TRIPLE*) ;; (*$CFG_HOST_TRIPLE*) ;;
(*) err "Host triple is not among the target triples." ;; (*) err "Host triple is not among the target triples." ;;
@ -628,10 +615,9 @@ putvar CFG_BUILD_DIR
putvar CFG_OSTYPE putvar CFG_OSTYPE
putvar CFG_CPUTYPE putvar CFG_CPUTYPE
putvar CFG_CONFIGURE_ARGS putvar CFG_CONFIGURE_ARGS
putvar CFG_HOST_TRIPLE putvar CFG_PREFIX
putvar CFG_TARGET_TRIPLES putvar CFG_TARGET_TRIPLES
putvar CFG_C_COMPILER putvar CFG_C_COMPILER
putvar CFG_PREFIX
putvar CFG_LIBDIR putvar CFG_LIBDIR
# Setting this again because it may have been changed # Setting this again because it may have been changed