In ModuleInfo.txt, make sure that the script being executed can be

found by prepending a .
In build-for-llvm-top.sh, dereference variables for exansion.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@39936 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/ModuleInfo.txt b/ModuleInfo.txt
index 113c1fff5d50436bb9a25cda07227c048a280b9a..bb88bb4b283640ced0b911be2fda61441f59ab6a 100644 (file)
--- a/ModuleInfo.txt
+++ b/ModuleInfo.txt
@@ -1,2 +1,2 @@
 DepModule: 
-BuildCmd: build-for-llvm-top.sh
+BuildCmd: ./build-for-llvm-top.sh

diff --git a/build-for-llvm-top.sh b/build-for-llvm-top.sh
index 13d90a416b80ad73cc045abfd190706b13631d65..3e4a4807cfc2ce415feb1696f9083d304c44df35 100644 (file)
--- a/build-for-llvm-top.sh
+++ b/build-for-llvm-top.sh
@@ -24,8 +24,9 @@ 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-llvmgccdir=$PREFIX"
-  echo ./configure $config_options $config_opts
-  ./configure $config_options $config_opts
+  config_options="$config_options $config_opts"
+  echo ./configure $config_options
+  ./configure $config_options || (echo "Can't configure llvm" ; exit 1)
 fi
 
 echo make $build_opts '&&' make install $build_opts