X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=build-for-llvm-top.sh;h=2a68c79965b8408748bf33f0d2a5077adb6c31cb;hb=0aaa4f0130b4d666e7715e47dca6c9bb87d5c8d0;hp=a5ddb79b8038dae2c6d7dbe371d35ae3344e9c79;hpb=9a9d03dac1030e979c53fef60352ad118374a7a5;p=oota-llvm.git

diff --git a/build-for-llvm-top.sh b/build-for-llvm-top.sh
index a5ddb79b803..2a68c79965b 100755
--- a/build-for-llvm-top.sh
+++ b/build-for-llvm-top.sh
@@ -7,17 +7,50 @@
 
 # Process the options passed in to us by the build script into standard
 # variables. 
-process_builder_args "$@"
+process_arguments "$@"
 
-# See if we have previously been configured by sensing the presense
+# See if we have previously been configured by sensing the presence
 # of the config.status scripts
 if test ! -x "config.status" ; then
   # We must configure so build a list of configure options
   config_options="--prefix=$PREFIX --with-llvmgccdir=$PREFIX"
+  if test "$OPTIMIZED" -eq 1 ; then
+    config_options="$config_options --enable-optimized"
+  else
+    config_options="$config_options --disable-optimized"
+  fi
+  if test "$DEBUG" -eq 1 ; then
+    config_options="$config_options --enable-debug"
+  else
+    config_options="$config_options --disable-debug"
+  fi
+  if test "$ASSERTIONS" -eq 1 ; then
+    config_options="$config_options --enable-assertions"
+  else
+    config_options="$config_options --disable-assertions"
+  fi
+  if test "$CHECKING" -eq 1 ; then
+    config_options="$config_options --enable-expensive-checks"
+  else
+    config_options="$config_options --disable-expensive-checks"
+  fi
+  if test "$DOXYGEN" -eq 1 ; then
+    config_options="$config_options --enable-doxygen"
+  else
+    config_options="$config_options --disable-doxygen"
+  fi
+  if test "$THREADS" -eq 1 ; then
+    config_options="$config_options --enable-threads"
+  else
+    config_options="$config_options --disable-threads"
+  fi
   config_options="$config_options $OPTIONS_DASH $OPTIONS_DASH_DASH"
   msg 0 Configuring $module with:
   msg 0 "  ./configure" $config_options
-  ./configure $config_options || (echo "Can't configure llvm" ; exit 1)
+  $LLVM_TOP/llvm/configure $config_options || \
+    die $? "Configuring llvm module failed"
+else
+  msg 0 Module $module already configured, ignoring configure options.
 fi
 
 msg 0 Building $module with: