Author: dpatel
Date: Fri Nov 9 16:03:13 2007
New Revision: 43965
URL: http://llvm.org/viewvc/llvm-project?rev=43965&view=rev
Log:
Support installed llvm location as --enable-llvm configure time parameter.
Similar patch was applied to llvm-gcc-4.2 couple of weeks ago.
Modified:
llvm-gcc-4.0/trunk/gcc/Makefile.in
llvm-gcc-4.0/trunk/gcc/configure
llvm-gcc-4.0/trunk/gcc/configure.ac
llvm-gcc-4.0/trunk/libcpp/configure
llvm-gcc-4.0/trunk/libcpp/configure.ac
Modified: llvm-gcc-4.0/trunk/gcc/Makefile.in
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/Makefile.in?rev=43965&r1=43964&r2=43965&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.0/trunk/gcc/Makefile.in Fri Nov 9 16:03:13 2007
@@ -221,7 +221,11 @@
# Determine BUILDMODE from configure run (--enable-llvm)
BUILDMODE := @LLVMBUILDMODE@
+ifneq ($(BUILDMODE),)
LLVMBINPATH = $(LLVMOBJDIR)/$(BUILDMODE)/bin
+else
+LLVMBINPATH = $(LLVMOBJDIR)/bin
+endif
ifeq ($(LLVMOBJDIR),)
CPPFLAGS = @CPPFLAGS@
Modified: llvm-gcc-4.0/trunk/gcc/configure
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/configure?rev=43965&r1=43964&r2=43965&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/gcc/configure (original)
+++ llvm-gcc-4.0/trunk/gcc/configure Fri Nov 9 16:03:13 2007
@@ -7111,6 +7111,8 @@
elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE="Debug-Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
{ { echo "$as_me:$LINENO: error: You must specify valid path to your LLVM
tree with --enable-llvm=DIR" >&5
echo "$as_me: error: You must specify valid path to your LLVM tree with
--enable-llvm=DIR" >&2;}
@@ -7754,7 +7756,7 @@
else
ac_prog_version=`$MAKEINFO --version 2>&1 |
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
- echo "configure:7757: version of makeinfo is $ac_prog_version" >&5
+ echo "configure:7759: version of makeinfo is $ac_prog_version" >&5
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
4.[2-9]*)
Modified: llvm-gcc-4.0/trunk/gcc/configure.ac
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/configure.ac?rev=43965&r1=43964&r2=43965&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.0/trunk/gcc/configure.ac Fri Nov 9 16:03:13 2007
@@ -767,6 +767,8 @@
elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE="Debug-Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
AC_MSG_ERROR([You must specify valid path to your LLVM tree with
--enable-llvm=DIR])
fi
Modified: llvm-gcc-4.0/trunk/libcpp/configure
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/libcpp/configure?rev=43965&r1=43964&r2=43965&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/libcpp/configure (original)
+++ llvm-gcc-4.0/trunk/libcpp/configure Fri Nov 9 16:03:13 2007
@@ -8045,6 +8045,8 @@
elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE="Debug-Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
{ { echo "$as_me:$LINENO: error: You must specify valid path to your LLVM
tree with --enable-llvm=DIR" >&5
echo "$as_me: error: You must specify valid path to your LLVM tree with
--enable-llvm=DIR" >&2;}
Modified: llvm-gcc-4.0/trunk/libcpp/configure.ac
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/libcpp/configure.ac?rev=43965&r1=43964&r2=43965&view=diff
==============================================================================
--- llvm-gcc-4.0/trunk/libcpp/configure.ac (original)
+++ llvm-gcc-4.0/trunk/libcpp/configure.ac Fri Nov 9 16:03:13 2007
@@ -181,6 +181,8 @@
elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE="Debug-Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
AC_MSG_ERROR([You must specify valid path to your LLVM tree with
--enable-llvm=DIR])
fi
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
