[llvm-commits] [llvm-gcc-4.2] r50834 - in /llvm-gcc-4.2/trunk/gcc: configure configure.ac

Devang Patel dpatel at apple.com
Wed May 7 15:24:25 PDT 2008


Author: dpatel
Date: Wed May  7 17:24:25 2008
New Revision: 50834

URL: http://llvm.org/viewvc/llvm-project?rev=50834&view=rev
Log:
Revert previous attempt to find appropriate llvm build.
This fixes PR2025 and restores old behavior.

Modified:
    llvm-gcc-4.2/trunk/gcc/configure
    llvm-gcc-4.2/trunk/gcc/configure.ac

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Wed May  7 17:24:25 2008
@@ -7370,42 +7370,28 @@
 
  LLVMBUILDMODE=""
  if test -x "$LLVMBASEPATH/Release/bin/llc$EXEEXT"; then
-   if test x$checkingenabled_flag  = x ; then
-     echo Found Release LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release"
-  fi
- fi
- if test -x "$LLVMBASEPATH/Debug/bin/llc$EXEEXT"; then
-   if test x$checkingenabled_flag  != x ; then
-     echo Found Debug LLVM Tree in $LLVMBASEPATH
+ elif test -x "$LLVMBASEPATH/Debug/bin/llc$EXEEXT"; then
      LLVMBUILDMODE="Debug"
-   fi
- fi
- if test -x "$LLVMBASEPATH/Release-Asserts/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Release-Asserts/bin/llc$EXEEXT"; then
      echo Found Release-Asserts LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release-Asserts"
- fi
- if test -x "$LLVMBASEPATH/Debug-Asserts/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Debug-Asserts/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts"
- fi
- if test -x "$LLVMBASEPATH/Release+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Release+Checks/bin/llc$EXEEXT"; then
      echo Found Release+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release+Checks"
- fi
- if test -x "$LLVMBASEPATH/Debug+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Debug+Checks/bin/llc$EXEEXT"; then
      echo Found Debug+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug+Checks"
- fi
- if test -x "$LLVMBASEPATH/Release-Asserts+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Release-Asserts+Checks/bin/llc$EXEEXT"; then
      echo Found Release-Asserts+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release-Asserts+Checks"
- fi
- if test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts+Checks"
- fi
- if test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
      echo Found Installed LLVM Tree in $LLVMBASEPATH
  elif test x$LLVMBUILDMODE = x; then
      { { echo "$as_me:$LINENO: error: You must specify valid path to your LLVM tree with --enable-llvm=DIR" >&5
@@ -8033,7 +8019,7 @@
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:8036: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:8022: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[4-9]*)
@@ -14455,6 +14441,7 @@
   # arbitrary sections are supported and try the test.
   as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
   if echo "$as_ver" | grep GNU > /dev/null; then
+    # LLVM local
     as_ver=`echo $as_ver | sed -e 's/GNU assembler[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
     as_major=`echo $as_ver | sed 's/\..*//'`
     as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
@@ -16454,14 +16441,14 @@
       # glibc 2.4 and later provides __stack_chk_fail and
       # either __stack_chk_guard, or TLS access to stack guard canary.
       if test -f $glibc_header_dir/features.h \
-         && $EGREP '^[       ]*#[         ]*define[       ]+__GNU_LIBRARY__[      ]+([1-9]0-9|6-9)' \
+         && $EGREP '^[       ]*#[         ]*define[       ]+__GNU_LIBRARY__[      ]+([1-9][0-9]|[6-9])' \
             $glibc_header_dir/features.h > /dev/null; then
-        if $EGREP '^[        ]*#[         ]*define[       ]+__GLIBC__[    ]+([1-9][0-9]|3-9)' \
+        if $EGREP '^[        ]*#[         ]*define[       ]+__GLIBC__[    ]+([1-9][0-9]|[3-9])' \
            $glibc_header_dir/features.h > /dev/null; then
           gcc_cv_libc_provides_ssp=yes
         elif $EGREP '^[      ]*#[         ]*define[       ]+__GLIBC__[    ]+2' \
              $glibc_header_dir/features.h > /dev/null \
-             && $EGREP '^[   ]*#[         ]*define[       ]+__GLIBC_MINOR__[      ]+([1-9]0-9|4-9)' \
+             && $EGREP '^[   ]*#[         ]*define[       ]+__GLIBC_MINOR__[      ]+([1-9][0-9]|[4-9])' \
              $glibc_header_dir/features.h > /dev/null; then
           gcc_cv_libc_provides_ssp=yes
         fi

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=50834&r1=50833&r2=50834&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Wed May  7 17:24:25 2008
@@ -855,42 +855,28 @@
 
  LLVMBUILDMODE=""
  if test -x "$LLVMBASEPATH/Release/bin/llc$EXEEXT"; then
-   if test x$checkingenabled_flag  = x ; then        
-     echo Found Release LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release"
-  fi
- fi
- if test -x "$LLVMBASEPATH/Debug/bin/llc$EXEEXT"; then
-   if test x$checkingenabled_flag  != x ; then        
-     echo Found Debug LLVM Tree in $LLVMBASEPATH
+ elif test -x "$LLVMBASEPATH/Debug/bin/llc$EXEEXT"; then
      LLVMBUILDMODE="Debug"
-   fi
- fi
- if test -x "$LLVMBASEPATH/Release-Asserts/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Release-Asserts/bin/llc$EXEEXT"; then
      echo Found Release-Asserts LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release-Asserts"
- fi
- if test -x "$LLVMBASEPATH/Debug-Asserts/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Debug-Asserts/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts"
- fi
- if test -x "$LLVMBASEPATH/Release+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Release+Checks/bin/llc$EXEEXT"; then
      echo Found Release+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release+Checks"
- fi
- if test -x "$LLVMBASEPATH/Debug+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Debug+Checks/bin/llc$EXEEXT"; then
      echo Found Debug+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug+Checks"
- fi
- if test -x "$LLVMBASEPATH/Release-Asserts+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Release-Asserts+Checks/bin/llc$EXEEXT"; then
      echo Found Release-Asserts+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release-Asserts+Checks"
- fi
- if test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts+Checks"
- fi
- if test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
+ elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
      echo Found Installed LLVM Tree in $LLVMBASEPATH
  elif test x$LLVMBUILDMODE = x; then
      AC_MSG_ERROR([You must specify valid path to your LLVM tree with --enable-llvm=DIR])





More information about the llvm-commits mailing list