summaryrefslogtreecommitdiff
path: root/distrib/configure.ac.in
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-01-30 14:43:53 +0000
committerSimon Marlow <marlowsd@gmail.com>2012-01-30 14:43:53 +0000
commit6b086342e1bf83d2aab6021703498bbf975beeed (patch)
treeeb899de11a99f6e04b9e6317267c344df763f53e /distrib/configure.ac.in
parent884a28d32ae468e2788ca772841aa4193664cf61 (diff)
downloadhaskell-6b086342e1bf83d2aab6021703498bbf975beeed.tar.gz
Validate fix: no cross compilation for bindists
Maybe we could revisit whether we want to allow building bindists of cross-compilers later, but for now I'm fixing validate by setting all the cross-compilation settings to NO.
Diffstat (limited to 'distrib/configure.ac.in')
-rw-r--r--distrib/configure.ac.in16
1 files changed, 15 insertions, 1 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 0037ff1ce8..8cb57c4509 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -21,6 +21,18 @@ FP_GMP
bootstrap_target=`ghc/stage2/build/tmp/ghc-stage2 +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//' | tr -d '\r'`
FPTOOLS_SET_PLATFORM_VARS
+BuildingCrossCompiler=NO
+PortingCompiler=NO
+CrossCompiling=NO
+CrossCompilePrefix=""
+TargetPlatformFull="${target}"
+
+AC_SUBST(BuildingCrossCompiler) # 'toolchain' case
+AC_SUBST(PortingCompiler) # 'port' case
+AC_SUBST(CrossCompiling) # BuildingCrossCompiler OR PortingCompiler
+AC_SUBST(CrossCompilePrefix)
+AC_SUBST(TargetPlatformFull)
+
#
dnl ** Check Perl installation **
#
@@ -51,7 +63,9 @@ XCODE_VERSION()
dnl ** Which gcc to use?
dnl --------------------------------------------------------------
-FIND_GCC()
+FIND_GCC([WhatGccIsCalled], [gcc], [gcc])
+CC="$WhatGccIsCalled"
+export CC
FP_GCC_VERSION
AC_PROG_CPP