[llvm-commits] [llvm-gcc-4.2] r43018 - in /llvm-gcc-4.2/trunk: gcc/Makefile.in gcc/configure gcc/configure.ac libcpp/configure libcpp/configure.ac

[Devang Patel]

Author: dpatel
Date: Mon Oct 15 16:59:22 2007
New Revision: 43018

URL: http://llvm.org/viewvc/llvm-project?rev=43018&view=rev
Log:
Accept installed llvm location (e.g. allow --enable-llvm=/usr/local )

Modified:
    llvm-gcc-4.2/trunk/gcc/Makefile.in
    llvm-gcc-4.2/trunk/gcc/configure
    llvm-gcc-4.2/trunk/gcc/configure.ac
    llvm-gcc-4.2/trunk/libcpp/configure
    llvm-gcc-4.2/trunk/libcpp/configure.ac

Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=43018&r1=43017&r2=43018&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Mon Oct 15 16:59:22 2007
@@ -234,7 +234,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.2/trunk/gcc/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure?rev=43018&r1=43017&r2=43018&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Mon Oct 15 16:59:22 2007
@@ -7392,6 +7392,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;}
@@ -8018,7 +8020,7 @@
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:8021: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:8023: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[4-9]*)

Modified: llvm-gcc-4.2/trunk/gcc/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure.ac?rev=43018&r1=43017&r2=43018&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Mon Oct 15 16:59:22 2007
@@ -877,6 +877,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.2/trunk/libcpp/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libcpp/configure?rev=43018&r1=43017&r2=43018&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/configure (original)
+++ llvm-gcc-4.2/trunk/libcpp/configure Mon Oct 15 16:59:22 2007
@@ -8310,6 +8310,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.2/trunk/libcpp/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libcpp/configure.ac?rev=43018&r1=43017&r2=43018&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/configure.ac (original)
+++ llvm-gcc-4.2/trunk/libcpp/configure.ac Mon Oct 15 16:59:22 2007
@@ -186,6 +186,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