mirror of
https://github.com/rust-lang/rust
synced 2024-10-14 04:23:37 +00:00
configure: add --llvm-root
Signed-off-by: Elly Jones <elly@leptoquark.net>
This commit is contained in:
parent
a26554d97b
commit
234a4e58bd
17
configure
vendored
17
configure
vendored
|
@ -85,9 +85,9 @@ valopt() {
|
||||||
local DOC="$*"
|
local DOC="$*"
|
||||||
if [ $HELP -eq 0 ]
|
if [ $HELP -eq 0 ]
|
||||||
then
|
then
|
||||||
local UOP=$(echo $OP | tr 'a-z-' 'A-Z_')
|
local UOP=$(echo $OP | tr 'a-z-' 'A-Z_')
|
||||||
local V="CFG_${UOP}"
|
local V="CFG_${UOP}"
|
||||||
eval $V="$DEFAULT"
|
eval $V="$DEFAULT"
|
||||||
for arg in $CFG_CONFIGURE_ARGS
|
for arg in $CFG_CONFIGURE_ARGS
|
||||||
do
|
do
|
||||||
if echo "$arg" | grep -q -- "--$OP="
|
if echo "$arg" | grep -q -- "--$OP="
|
||||||
|
@ -98,8 +98,12 @@ valopt() {
|
||||||
done
|
done
|
||||||
putvar $V
|
putvar $V
|
||||||
else
|
else
|
||||||
local OPDEF="${OP}=[${DEFAULT}]"
|
if [ -z "$DEFAULT" ]
|
||||||
printf " --%-30s %s\n" "$OPDEF" "$DOC"
|
then
|
||||||
|
DEFAULT="<none>"
|
||||||
|
fi
|
||||||
|
OP="${OP}=[${DEFAULT}]"
|
||||||
|
printf " --%-30s %s\n" "$OP" "$DOC"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -246,14 +250,13 @@ opt docs 1 "build documentation"
|
||||||
opt optimize 1 "build optimized rust code"
|
opt optimize 1 "build optimized rust code"
|
||||||
opt mingw-cross 0 "cross-compile for win32 using mingw"
|
opt mingw-cross 0 "cross-compile for win32 using mingw"
|
||||||
valopt prefix "/usr/local" "set installation prefix"
|
valopt prefix "/usr/local" "set installation prefix"
|
||||||
|
valopt llvm-root "" "set llvm root"
|
||||||
|
|
||||||
if [ $HELP -eq 1 ]
|
if [ $HELP -eq 1 ]
|
||||||
then
|
then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Useful environment variables:"
|
echo "Useful environment variables:"
|
||||||
echo ""
|
echo ""
|
||||||
printf " %-32s %s\n" "CFG_LLVM_ROOT" "The host LLVM install"
|
|
||||||
printf " %-32s %s\n" "CFG_PREFIX" "The installation prefix"
|
|
||||||
printf " %-32s %s\n" "CFG_ONLY_GCC" "Prefer gcc to clang for building the runtime"
|
printf " %-32s %s\n" "CFG_ONLY_GCC" "Prefer gcc to clang for building the runtime"
|
||||||
printf " %-32s %s\n" "CFG_TARGET_TRIPLES" "LLVM target triples"
|
printf " %-32s %s\n" "CFG_TARGET_TRIPLES" "LLVM target triples"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
Loading…
Reference in a new issue