llvm.org GIT mirror llvm / 1fbf5a4
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 Peter Collingbourne 9 years ago
2 changed file(s) with 11 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all
1212 if test -d ../../../autoconf/m4 ; then
1313 cd ../../../autoconf/m4
1414 llvm_m4=`pwd`
15 llvm_src_root=../../..
16 llvm_obj_root=../../..
15 llvm_src_root=../..
16 llvm_obj_root=../..
1717 cd $cwd
1818 elif test -d ../../llvm/autoconf/m4 ; then
1919 cd ../../llvm/autoconf/m4
2020 llvm_m4=`pwd`
21 llvm_src_root=../..
22 llvm_obj_root=../..
21 llvm_src_root=..
22 llvm_obj_root=..
2323 cd $cwd
2424 else
2525 while true ; do
33 AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs@yourdomain])
44
55 dnl Identify where LLVM source tree is
6 LLVM_SRC_ROOT="../../"
7 LLVM_OBJ_ROOT="../../"
6 LLVM_SRC_ROOT="../.."
7 LLVM_OBJ_ROOT="../.."
8
9 dnl Find absolute paths to LLVM source and object trees
10 LLVM_ABS_SRC_ROOT="`cd $srcdir ; cd $LLVM_SRC_ROOT ; pwd`"
11 LLVM_ABS_OBJ_ROOT="`cd $LLVM_OBJ_ROOT ; pwd`"
812
913 dnl Tell autoconf that this is an LLVM project being configured
1014 dnl This provides the --with-llvmsrc and --with-llvmobj options
11 LLVM_CONFIG_PROJECT($LLVM_SRC_ROOT,$LLVM_OBJ_ROOT)
15 LLVM_CONFIG_PROJECT($LLVM_ABS_SRC_ROOT,$LLVM_ABS_OBJ_ROOT)
1216
1317 dnl Tell autoconf that the auxilliary files are actually located in
1418 dnl the LLVM autoconf directory, not here.