diff --git a/common/environment/setup/options.sh b/common/environment/setup/options.sh
index 8f1b81d4b08..21be113a39f 100644
--- a/common/environment/setup/options.sh
+++ b/common/environment/setup/options.sh
@@ -1,8 +1,7 @@
 # vim: set ts=4 sw=4 et:
 
 vopt_if() {
-    local opt="$1" t="$2" f="$3"
-    name="build_option_$opt"
+    local name="build_option_$1" t="$2" f="$3"
     if [ ${!name} ]; then
         echo -n "$t"
     else
@@ -12,7 +11,7 @@ vopt_if() {
 
 vopt_with() {
     local opt="$1" flag="${2:-$1}"
-    vopt_if "$1" "--with-${flag}" "--without-${flag}"
+    vopt_if "$opt" "--with-${flag}" "--without-${flag}"
 }
 
 vopt_enable() {