Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option validation to configure #4089

Merged
merged 1 commit into from
Dec 6, 2012
Merged

Add option validation to configure #4089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,38 @@ probe_need() {
fi
}

validate_opt () {
for arg in $CFG_CONFIGURE_ARGS
do
isArgValid=0
for option in $BOOL_OPTIONS
do
if test --disable-$option = $arg
then
isArgValid=1
fi
if test --enable-$option = $arg
then
isArgValid=1
fi
done
for option in $VAL_OPTIONS
do
if echo "$arg" | grep -q -- "--$option="
then
isArgValid=1
fi
done
if test $isArgValid -eq 0
then
err "Option '$arg' is not recognized"
fi
done
}

valopt() {
VAL_OPTIONS="$VAL_OPTIONS $1"

local OP=$1
local DEFAULT=$2
shift
Expand Down Expand Up @@ -145,6 +176,8 @@ valopt() {
}

opt() {
BOOL_OPTIONS="$BOOL_OPTIONS $1"

local OP=$1
local DEFAULT=$2
shift
Expand Down Expand Up @@ -293,6 +326,9 @@ else
step_msg "processing $CFG_SELF args"
fi

BOOL_OPTIONS=""
VAL_OPTIONS=""

opt sharedstd 1 "build libstd as a shared library"
opt valgrind 0 "run tests with valgrind (memcheck by default)"
opt helgrind 0 "run tests with helgrind instead of memcheck"
Expand All @@ -313,6 +349,10 @@ valopt llvm-root "" "set LLVM root"
valopt host-triple "${DEFAULT_HOST_TRIPLE}" "LLVM host triple"
valopt target-triples "${CFG_HOST_TRIPLE}" "LLVM target triples"

# Validate Options
step_msg "validating $CFG_SELF args"
validate_opt

if [ $HELP -eq 1 ]
then
echo ""
Expand Down