Skip to content

Commit

Permalink
Fix paths; AutoRegen.sh changes its current working directory to be the
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pcc committed Dec 12, 2010
1 parent eb13382 commit 1fbf5a4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
8 changes: 4 additions & 4 deletions projects/sample/autoconf/AutoRegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions projects/sample/autoconf/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 1fbf5a4

Please sign in to comment.