diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-06 13:34:34 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-06 21:11:33 +0100 |
| commit | 8b422142421c751d2c7fa7840afa61f923afdbe1 (patch) | |
| tree | 257f617171c05661d51ecdb5ce83a7b5cce84ee4 | |
| parent | 986ceb1679b501414b996c520b08ce929a40f94c (diff) | |
| download | haskell-8b422142421c751d2c7fa7840afa61f923afdbe1.tar.gz | |
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
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libraries/base/configure.ac | 8 | ||||
| -rw-r--r-- | libraries/integer-gmp/configure.ac | 4 | ||||
| m--------- | libraries/unix | 0 |
4 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 57d877ab58..c8708ae7db 100644 --- a/configure.ac +++ b/configure.ac @@ -58,9 +58,6 @@ dnl #define SIZEOF_CHAR 0 dnl recently. AC_PREREQ([2.60]) -dnl make extensions visible to allow feature-tests to detect them lateron -AC_USE_SYSTEM_EXTENSIONS - # ------------------------------------------------------------------------- # Prepare to generate the following header files # @@ -462,6 +459,9 @@ export CC MAYBE_OVERRIDE_STAGE0([gcc],[CC_STAGE0]) MAYBE_OVERRIDE_STAGE0([ar],[AR_STAGE0]) +dnl make extensions visible to allow feature-tests to detect them lateron +AC_USE_SYSTEM_EXTENSIONS + dnl ** figure out how to invoke the C preprocessor (i.e. `gcc -E`) AC_PROG_CPP 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 diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac index 0bd91887b8..4e3df11d07 100644 --- a/libraries/integer-gmp/configure.ac +++ b/libraries/integer-gmp/configure.ac @@ -1,5 +1,5 @@ +AC_PREREQ(2.60) AC_INIT([Haskell integer (GMP)], [1.0], [libraries@haskell.org], [integer]) -AC_PREREQ(2.52) # Safety check: Ensure that we are in the correct source directory. AC_CONFIG_SRCDIR([cbits/wrappers.c]) @@ -10,6 +10,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 dnl-------------------------------------------------------------------- diff --git a/libraries/unix b/libraries/unix -Subproject 5740003e06f0c585460501514f3352f5e105c98 +Subproject 147630c7c76bd9b947524ef140d21b9e81967c6 |