diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-10-18 23:10:47 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-10-18 23:10:47 +0000 |
| commit | 2532fa21a963edf53183357edfc79a9361b44435 (patch) | |
| tree | 437546067c905d1d6cd931a47b663c548c290607 /projects/sample/autoconf/AutoRegen.sh | |
| parent | 857bf8341498448851fd7205e48307138823698b (diff) | |
projects/sample: Import adapted form of current LLVM autoconf/Makefile setup so that projects/sample is standalone and not tied to the LLVM build setup.
- This currently just moves over all of the behavior from LLVM. Eventually all of the configure checks that are directly needed by the LLVM build setup should probably go away, and the project should manage their own configuration checks if necessary.
- This is the 1st half of this work, the actual Makefile.common hasn't moved over yet. I've tried to stage this in such a way that incremental builds will properly reconfigure for most active developers (the Makefiles don't handle reconfiguring in a perfectly reliable way, and I haven't found an easy way to make them do so).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142456 91177308-0d34-0410-b5e6-96231b3b80d8
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 6e6931c7a9..b91b3e446a 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 .. |