aboutsummaryrefslogtreecommitdiffstats
path: root/autoconf
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2009-09-29 06:18:00 +0000
committerNick Lewycky <nicholas@mxc.ca>2009-09-29 06:18:00 +0000
commit166b2b169a5800f84473cf099f2e8d999eea09a3 (patch)
treef9f985897373f537193d94c53b9c13ea494ec7f4 /autoconf
parent83fc447a4fe2a45609db64b148eab21dc08d4a2e (diff)
downloadexternal_llvm-166b2b169a5800f84473cf099f2e8d999eea09a3.zip
external_llvm-166b2b169a5800f84473cf099f2e8d999eea09a3.tar.gz
external_llvm-166b2b169a5800f84473cf099f2e8d999eea09a3.tar.bz2
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83051 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
-rw-r--r--autoconf/configure.ac18
1 files changed, 10 insertions, 8 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index bdd665c..dee9037 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -284,14 +284,6 @@ if test "$llvm_cv_target_arch" = "Unknown" ; then
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=== SECTION 9: Additional checks, variables, etc.
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])