diff --git a/helpers/llvm-build b/helpers/llvm-build
index 938caa5..b674fa9 100755
--- a/helpers/llvm-build
+++ b/helpers/llvm-build
@@ -8,6 +8,8 @@
 
 . llvm-common
 
+safe_run verify_env
+
 ## CMD line options and defaults
 CPUs=`grep -c proc /proc/cpuinfo`
 build_dir=$LLVM_BLD
@@ -16,13 +18,12 @@
 shared=
 targets=
 prog=`basename $0`
-syntax="Syntax: $prog [-u(pdate)] [-c(check-all)] [-i(nstall)] [-d(debug)]"
+syntax="Syntax: $prog [-u(pdate)] [-c(check-all)] [-i(nstall)]"
 update=false
 check=false
 master=false
-debug=false
 inst=false
-while getopts "ucimd" opt; do
+while getopts "ucim" opt; do
   case $opt in
     u)
       update=true
@@ -36,10 +37,6 @@
     m)
       master=true
       ;;
-    d)
-      debug=true
-      build_dir=$LLVM_BLD/../debug
-      ;;
     *)
       echo $syntax
       exit 1
@@ -68,7 +65,7 @@
 fi
 
 ## Debug mode, make it lighter
-if $debug; then
+if [ "$LLVM_DEBUG" = true ]; then
   build_type=Debug
   shared=-DBUILD_SHARED_LIBS=True
   targets=-DLLVM_TARGETS_TO_BUILD="ARM;X86;AArch64"