Modernize llvm-top support.

llvm-svn: 40406

2 files changed, 9 insertions, 25 deletions

diff --git a/stacker/ModuleInfo.txt b/stacker/ModuleInfo.txt
index 5edf90ece43..c6603bc35f0 100644
--- a/stacker/ModuleInfo.txt
+++ b/stacker/ModuleInfo.txt
@@ -1,2 +1,4 @@
 DepModule: llvm
 BuildCmd: ./build-for-llvm-top.sh
+CleanCmd: make clean
+InstallCmd: make install
diff --git a/stacker/build-for-llvm-top.sh b/stacker/build-for-llvm-top.sh
index bc9a5569f7c..4f225cbd197 100755
--- a/stacker/build-for-llvm-top.sh
+++ b/stacker/build-for-llvm-top.sh
@@ -1,35 +1,17 @@
 #!/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=//'`
-      ;;
-    ENABLE_OPTIMIZED=1)
-      is_debug=0
-      ;;
-    *=*)
-      build_opts="$build_opts $arg"
-      ;;
-    --*)
-      config_opts="$config_opts $arg"
-      ;;
-  esac
-done
+. ../library.sh
+
+process_arguments "$@"
 
 # See if we have previously been configured by sensing the presense
 # of the config.status scripts
 config_status="$build_dir/config.status"
 if test ! -d "$config_status" ; then
   # We must configure so build a list of configure options
-  config_options="--prefix=$PREFIX --with-llvmsrc=$LLVM_TOP/llvm"
-  config_options="$config_options --with-llvmobj=$LLVM_TOP/llvm"
-  echo ./configure $config_options $config_opts
-  ./configure $config_options $config_opts
+  config_options="--prefix=$PREFIX --with-llvm-top=$LLVM_TOP"
+  echo ./configure $config_options
+  ./configure $config_options
 fi
 
-make $build_opts && make install $build_opts
+make