aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2007-07-16 22:25:13 +0000
committerReid Spencer <rspencer@reidspencer.com>2007-07-16 22:25:13 +0000
commit8c88b6de6270de28169ffbdef25894d21e22b235 (patch)
tree80873d9e0951e5c09e64555057f426cb730c0928
parente68da83d491b3fb9aa865d898b192aeac778bb63 (diff)
downloadexternal_llvm-8c88b6de6270de28169ffbdef25894d21e22b235.zip
external_llvm-8c88b6de6270de28169ffbdef25894d21e22b235.tar.gz
external_llvm-8c88b6de6270de28169ffbdef25894d21e22b235.tar.bz2
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
-rw-r--r--ModuleInfo.txt2
-rw-r--r--build-for-llvm-top.sh5
2 files changed, 4 insertions, 3 deletions
diff --git a/ModuleInfo.txt b/ModuleInfo.txt
index 113c1ff..bb88bb4 100644
--- 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 13d90a4..3e4a480 100644
--- 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