diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2010-12-12 21:41:56 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2010-12-12 21:41:56 +0000 |
| commit | 1fbf5a492e73549ff546ec34497fc1c185755af6 (patch) | |
| tree | 1aea901035874a622cf13268c818f296ca63e3fc /projects | |
| parent | eb1338233399dec17c4a7b88f5ec2866606d4bb0 (diff) | |
Fix paths; AutoRegen.sh changes its current working directory to be the
autoconf directory, but these paths need to be relative to the main
source directory. Patch originally by Dan Gohman, r67655.
Also, cause configure.ac to find absolute paths to LLVM source and
object trees. Together, fixes PR1220.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121645 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/sample/autoconf/AutoRegen.sh | 8 | ||||
| -rw-r--r-- | projects/sample/autoconf/configure.ac | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/projects/sample/autoconf/AutoRegen.sh b/projects/sample/autoconf/AutoRegen.sh index 126703ba5a..6e6931c7a9 100755 --- a/projects/sample/autoconf/AutoRegen.sh +++ b/projects/sample/autoconf/AutoRegen.sh @@ -13,14 +13,14 @@ cwd=`pwd` if test -d ../../../autoconf/m4 ; then cd ../../../autoconf/m4 llvm_m4=`pwd` - llvm_src_root=../../.. - llvm_obj_root=../../.. + 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 diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index 221dcc45ed..4e61bee5e7 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -4,12 +4,16 @@ dnl ************************************************************************** AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs@yourdomain]) dnl Identify where LLVM source tree is -LLVM_SRC_ROOT="../../" -LLVM_OBJ_ROOT="../../" +LLVM_SRC_ROOT="../.." +LLVM_OBJ_ROOT="../.." + +dnl Find absolute paths to LLVM source and object trees +LLVM_ABS_SRC_ROOT="`cd $srcdir ; cd $LLVM_SRC_ROOT ; pwd`" +LLVM_ABS_OBJ_ROOT="`cd $LLVM_OBJ_ROOT ; pwd`" dnl Tell autoconf that this is an LLVM project being configured dnl This provides the --with-llvmsrc and --with-llvmobj options -LLVM_CONFIG_PROJECT($LLVM_SRC_ROOT,$LLVM_OBJ_ROOT) +LLVM_CONFIG_PROJECT($LLVM_ABS_SRC_ROOT,$LLVM_ABS_OBJ_ROOT) dnl Tell autoconf that the auxilliary files are actually located in dnl the LLVM autoconf directory, not here. |