Commit 8b422142 authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

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
7af29da0
which hopefully fixes #11168
parent 986ceb16
......@@ -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
......
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
......
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--------------------------------------------------------------------
......
Subproject commit 5740003e06f0c585460501514f3352f5e105c98c
Subproject commit 147630c7c76bd9b947524ef140d21b9e81967c6e
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment