diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2012-04-14 13:54:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2012-04-14 13:54:10 +0000 |
| commit | 63faed5b8e4f2755f127fcb8aa440480c0649327 (patch) | |
| tree | 19c69a04768629f2d440944b71cbe90adae0b615 /projects/sample/autoconf/AutoRegen.sh | |
| parent | d4c8b5d2e851b0e8a063c6bf8543a4823a26c15a (diff) | |
Diffstat (limited to 'projects/sample/autoconf/AutoRegen.sh')
| -rwxr-xr-x | projects/sample/autoconf/AutoRegen.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh index 6e6931c7a9bc..b91b3e446a13 100755 --- a/projects/sample/autoconf/AutoRegen.sh +++ b/projects/sample/autoconf/AutoRegen.sh @@ -12,15 +12,13 @@ fi cwd=`pwd` if test -d ../../../autoconf/m4 ; then cd ../../../autoconf/m4 - llvm_m4=`pwd` llvm_src_root=../.. llvm_obj_root=../.. cd $cwd elif test -d ../../llvm/autoconf/m4 ; then cd ../../llvm/autoconf/m4 - llvm_m4=`pwd` - llvm_src_root=.. - llvm_obj_root=.. + llvm_src_root=../.. + llvm_obj_root=../.. cd $cwd else while true ; do @@ -28,7 +26,6 @@ else read -p "Enter full path to LLVM source:" REPLY if test -d "$REPLY/autoconf/m4" ; then llvm_src_root="$REPLY" - llvm_m4="$REPLY/autoconf/m4" read -p "Enter full path to LLVM objects (empty for same as source):" REPLY if test -d "$REPLY" ; then llvm_obj_root="$REPLY" @@ -39,13 +36,9 @@ else fi done fi -# Patch the LLVM_ROOT in configure.ac, if it needs it -cp configure.ac configure.bak -sed -e "s#^LLVM_SRC_ROOT=.*#LLVM_SRC_ROOT=\"$llvm_src_root\"#" \ - -e "s#^LLVM_OBJ_ROOT=.*#LLVM_OBJ_ROOT=\"$llvm_obj_root\"#" configure.bak > configure.ac echo "Regenerating aclocal.m4 with aclocal" rm -f aclocal.m4 -aclocal -I $llvm_m4 -I "$llvm_m4/.." || die "aclocal failed" +aclocal -I $cwd/m4 || die "aclocal failed" echo "Regenerating configure with autoconf" autoconf --warnings=all -o ../configure configure.ac || die "autoconf failed" cd .. |