[llvm-commits] [llvm] r83051 - /llvm/trunk/autoconf/configure.ac

[Nick Lewycky]

Author: nicholas
Date: Tue Sep 29 01:18:00 2009
New Revision: 83051

URL: http://llvm.org/viewvc/llvm-project?rev=83051&view=rev
Log:
Fix configure bug that only shows up in a clean build. Don't try to invoke gcc
until after the compiler itself has been set up.

Modified:
    llvm/trunk/autoconf/configure.ac

Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=83051&r1=83050&r2=83051&view=diff

==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Tue Sep 29 01:18:00 2009
@@ -284,14 +284,6 @@
   AC_MSG_WARN([Configuring LLVM for an unknown target archicture])
 fi
 
-dnl Handle 32-bit linux systems running a 64-bit kernel.
-if test "$llvm_cv_os_type" = "Linux" -a "$llvm_cv_target_arch" = "x86_64" ; then
-  AC_IS_LINUX_MIXED
-  if test "$llvm_cv_linux_mixed" = "yes"; then
-    llvm_cv_target_arch="x86"
-  fi
-fi
-
 # Determine the LLVM native architecture for the target
 case "$llvm_cv_target_arch" in
     x86)     LLVM_NATIVE_ARCH="X86" ;;
@@ -1158,6 +1150,16 @@
 dnl===
 dnl===-----------------------------------------------------------------------===
 
+dnl Handle 32-bit linux systems running a 64-bit kernel.
+dnl This has to come after section 4 because it invokes the compiler.
+if test "$llvm_cv_os_type" = "Linux" -a "$llvm_cv_target_arch" = "x86_64" ; then
+  AC_IS_LINUX_MIXED
+  if test "$llvm_cv_linux_mixed" = "yes"; then
+    llvm_cv_target_arch="x86"
+    ARCH="x86"
+  fi
+fi
+
 dnl Check, whether __dso_handle is present
 AC_CHECK_FUNCS([__dso_handle])