[commit: ghc] master: configure: Pass HC_OPTS_STAGEx to build system (9030d8e)

git at git.haskell.org git at git.haskell.org
Thu Nov 10 18:50:53 UTC 2016


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9030d8e4dc321dbcd32baae33f150b4e7c8ed141/ghc

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

commit 9030d8e4dc321dbcd32baae33f150b4e7c8ed141
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Nov 4 15:03:55 2016 -0400

    configure: Pass HC_OPTS_STAGEx to build system
    
    Test Plan: Try `./configure HC_OPTS_STAGE0=-foobar` and watch it fail
    
    Reviewers: austin, hvr
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D2674


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

9030d8e4dc321dbcd32baae33f150b4e7c8ed141
 configure.ac    | 4 ++++
 mk/config.mk.in | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9b0b549..70c4447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -643,6 +643,10 @@ AC_SUBST(CONF_LD_LINKER_OPTS_STAGE2)
 AC_SUBST(CONF_CPP_OPTS_STAGE0)
 AC_SUBST(CONF_CPP_OPTS_STAGE1)
 AC_SUBST(CONF_CPP_OPTS_STAGE2)
+# Flags passed to the Haskell compiler
+AC_SUBST(CONF_HC_OPTS_STAGE0)
+AC_SUBST(CONF_HC_OPTS_STAGE1)
+AC_SUBST(CONF_HC_OPTS_STAGE2)
 
 dnl ** Set up the variables for the platform in the settings file.
 dnl May need to use gcc to find platform details.
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2163643..35c492f 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -618,6 +618,9 @@ CONF_LD_LINKER_OPTS_STAGE2 = @CONF_LD_LINKER_OPTS_STAGE2@
 CONF_CPP_OPTS_STAGE0 = @CONF_CPP_OPTS_STAGE0@
 CONF_CPP_OPTS_STAGE1 = @CONF_CPP_OPTS_STAGE1@
 CONF_CPP_OPTS_STAGE2 = @CONF_CPP_OPTS_STAGE2@
+CONF_HC_OPTS_STAGE0 = @CONF_HC_OPTS_STAGE0@
+CONF_HC_OPTS_STAGE1 = @CONF_HC_OPTS_STAGE1@
+CONF_HC_OPTS_STAGE2 = @CONF_HC_OPTS_STAGE2@
 
 # The .hsc files aren't currently safe for cross-compilation on Windows:
 #     libraries\haskeline\.\System\Console\Haskeline\Backend\Win32.hsc:160



More information about the ghc-commits mailing list