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

[Bill Wendling]

Author: void
Date: Sat Aug 23 16:16:02 2008
New Revision: 55256

URL: http://llvm.org/viewvc/llvm-project?rev=55256&view=rev
Log:
Reverting r55229. This was breaking the build in release mode. When
"--enable-optimized" was used during configuration of llvm-gcc, it would look
for headers and libraries in the Debug build directory. My guess is that the check

   if test x$checkingenabled_flag != x; then

should check that "checkingenabled_flag" is not equal to "xno".

When reapplying this patch, please do a build of llvm-gcc in all modes.

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=55256&r1=55255&r2=55256&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Sat Aug 23 16:16:02 2008
@@ -7369,9 +7369,7 @@
  esac
 
  LLVMBUILDMODE=""
- if test x$checkingenabled_flag != x; then
-     LLVMBUILDMODE="Debug"
- elif test -x "$LLVMBASEPATH/Release/bin/llc$EXEEXT"; then
+ if test -x "$LLVMBASEPATH/Release/bin/llc$EXEEXT"; then
      LLVMBUILDMODE="Release"
  elif test -x "$LLVMBASEPATH/Debug/bin/llc$EXEEXT"; then
      LLVMBUILDMODE="Debug"

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=55256&r1=55255&r2=55256&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Sat Aug 23 16:16:02 2008
@@ -854,9 +854,7 @@
  esac
 
  LLVMBUILDMODE=""
- if test "x$checkingenabled_flag" != x; then
-     LLVMBUILDMODE="Debug"
- elif test -x "$LLVMBASEPATH/Release/bin/llc$EXEEXT"; then
+ if test -x "$LLVMBASEPATH/Release/bin/llc$EXEEXT"; then
      LLVMBUILDMODE="Release"
  elif test -x "$LLVMBASEPATH/Debug/bin/llc$EXEEXT"; then
      LLVMBUILDMODE="Debug"