[commit: ghc] master: Tweak use of AC_USE_SYSTEM_EXTENSIONS (8b42214)

git at git.haskell.org git at git.haskell.org
Sun Dec 6 20:11:17 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8b422142421c751d2c7fa7840afa61f923afdbe1/ghc

>---------------------------------------------------------------

commit 8b422142421c751d2c7fa7840afa61f923afdbe1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 6 13:34:34 2015 +0100

    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


>---------------------------------------------------------------

8b422142421c751d2c7fa7840afa61f923afdbe1
 configure.ac                       | 6 +++---
 libraries/base/configure.ac        | 8 +++-----
 libraries/integer-gmp/configure.ac | 4 +++-
 libraries/unix                     | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57d877a..c8708ae 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 99474a6..3d372d7 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 at 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 0bd9188..4e3df11 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 at 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
index 5740003..147630c 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 5740003e06f0c585460501514f3352f5e105c98c
+Subproject commit 147630c7c76bd9b947524ef140d21b9e81967c6e



More information about the ghc-commits mailing list