From 8b422142421c751d2c7fa7840afa61f923afdbe1 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sun, 6 Dec 2015 13:34:34 +0100 Subject: Tweak use of AC_USE_SYSTEM_EXTENSIONS This makes sure that `AC_USE_SYSTEM_EXTENSIONS` (which implies `AC_PROG_CC`) is called after the `AC_ARG_WITH([cc],,)` invocation, so that the proper CC setting is in scope. Otherwise this can break cross-compilation. This also needs to pull in a submodule update for `unix` This is a follow-up commit to 7af29da05d2e5a5e311a5f73f20d0f232035973b which hopefully fixes #11168 --- libraries/base/configure.ac | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libraries/base/configure.ac') diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac index 99474a63a7..3d372d7713 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac @@ -1,13 +1,9 @@ +AC_PREREQ([2.60]) AC_INIT([Haskell base package], [1.0], [libraries@haskell.org], [base]) # Safety check: Ensure that we are in the correct source directory. AC_CONFIG_SRCDIR([include/HsBase.h]) -AC_PREREQ([2.60]) - -dnl make extensions visible to allow feature-tests to detect them lateron -AC_USE_SYSTEM_EXTENSIONS - AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h]) AC_CANONICAL_BUILD @@ -18,6 +14,8 @@ AC_ARG_WITH([cc], [C compiler], [CC=$withval]) AC_PROG_CC() +dnl make extensions visible to allow feature-tests to detect them lateron +AC_USE_SYSTEM_EXTENSIONS AC_MSG_CHECKING(for WINDOWS platform) case $host in -- cgit v1.2.1