X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=build-for-llvm-top.sh;h=2a68c79965b8408748bf33f0d2a5077adb6c31cb;hb=4b84086e89d86fb16f562166d9fea8df37db6be7;hp=13d90a416b80ad73cc045abfd190706b13631d65;hpb=09d0594d0bb9d3c120a037a283ada913c0def4db;p=oota-llvm.git

diff --git a/build-for-llvm-top.sh b/build-for-llvm-top.sh
old mode 100644
new mode 100755
index 13d90a416b8..2a68c79965b
--- a/build-for-llvm-top.sh
+++ b/build-for-llvm-top.sh
@@ -1,32 +1,58 @@
 #!/bin/sh
 
-is_debug=1
-for arg in "$@" ; do
-  case "$arg" in
-    LLVM_TOP=*)
-      LLVM_TOP=`echo "$arg" | sed -e 's/LLVM_TOP=//'`
-      ;;
-    PREFIX=*)
-      PREFIX=`echo "$arg" | sed -e 's/PREFIX=//'`
-      ;;
-    *=*)
-      build_opts="$build_opts $arg"
-      ;;
-    --*)
-      config_opts="$config_opts $arg"
-      ;;
-  esac
-done
+# This includes the Bourne shell library from llvm-top. Since this file is
+# generally only used when building from llvm-top, it is safe to assume that
+# llvm is checked out into llvm-top in which case .. just works.
+. ../library.sh
 
-# See if we have previously been configured by sensing the presense
+# Process the options passed in to us by the build script into standard
+# variables. 
+process_arguments "$@"
+
+# See if we have previously been configured by sensing the presence
 # of the config.status scripts
-config_status="$build_dir/config.status"
-if test ! -d "$config_status" ; then
+if test ! -x "config.status" ; then
   # We must configure so build a list of configure options
   config_options="--prefix=$PREFIX --with-llvmgccdir=$PREFIX"
-  echo ./configure $config_options $config_opts
-  ./configure $config_options $config_opts
+  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
+  $LLVM_TOP/llvm/configure $config_options || \
+    die $? "Configuring llvm module failed"
+else
+  msg 0 Module $module already configured, ignoring configure options.
 fi
 
-echo make $build_opts '&&' make install $build_opts
-make $build_opts && make install $build_opts
+msg 0 Building $module with:
+msg 0 "  make" $OPTIONS_ASSIGN tools-only
+make $OPTIONS_ASSIGN tools-only