X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure.ac.in;h=cc834679d36b6b823ff84bdca71072b81c7dcbb3;hb=140aeb3949039cb7df43ac2d7e4a755fb4711879;hp=ec2ea33f7dbf61c986d5a3342166660405528aef;hpb=a8ad2066bf5efa534fccb945da63aad366b989d9;p=ghc-hetmet.git

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index ec2ea33..cc83467 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -62,8 +62,13 @@ dnl ** Find the path to sed **
 AC_PATH_PROG(SedCmd,sed)
 
 #
-dnl ** How to invoke cpp directly **
+dnl ** How to invoke gcc/cpp **
 #
+FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc])
+export CC
+WhatGccIsCalled="$CC"
+AC_SUBST(WhatGccIsCalled)
+
 FP_HAVE_GCC
 AC_PROG_CPP
 
@@ -72,15 +77,41 @@ dnl ** Check gcc version and flags we need to pass it **
 #
 FP_GCC_EXTRA_FLAGS
 
-CONF_CC_OPTS="@CONF_CC_OPTS@"
-CONF_LD_OPTS="@CONF_LD_OPTS@"
-AC_SUBST(CONF_CC_OPTS)
-AC_SUBST(CONF_LD_OPTS)
+FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS])
+FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2])
+
+AC_SUBST(CONF_CC_OPTS_STAGE0)
+AC_SUBST(CONF_CC_OPTS_STAGE1)
+AC_SUBST(CONF_CC_OPTS_STAGE2)
+AC_SUBST(CONF_LD_OPTS_STAGE0)
+AC_SUBST(CONF_LD_OPTS_STAGE1)
+AC_SUBST(CONF_LD_OPTS_STAGE2)
 
 #
 AC_CONFIG_FILES(extra-gcc-opts mk/config.mk mk/install.mk)
 AC_OUTPUT
 
+# We get caught by
+#     http://savannah.gnu.org/bugs/index.php?1516
+#     $(eval ...) inside conditionals causes errors
+# with make 3.80, so warn the user if it looks like they're about to
+# try to use it.
+# We would use "grep -q" here, but Solaris's grep doesn't support it.
+checkMake380() {
+    if $1 --version 2>&1 | head -1 | grep 'GNU Make 3\.80' > /dev/null
+    then
+        echo
+        echo "WARNING: It looks like \"$1\" is GNU make 3.80."
+        echo "This version cannot be used to build GHC."
+        echo "Please use GNU make >= 3.81."
+    fi
+}
+
+checkMake380 make
+checkMake380 gmake
+
 echo "****************************************************"
 echo "Configuration done, ready to 'make install'"
 echo "(see README and INSTALL files for more info.)"