[commit: ghc] ghc-8.0: configure: Pass HC_OPTS_STAGEx to build system (891ffe9)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/891ffe9066abd82c5760d1218f6ae2cd0d346146/ghc

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

commit 891ffe9066abd82c5760d1218f6ae2cd0d346146
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
    
    (cherry picked from commit c8e79c037097a4ccb40fa8241ca904d90ea84cce)


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

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

diff --git a/configure.ac b/configure.ac
index 8259f0c..57726d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -682,6 +682,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 5a4c9ca..9de3537 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -626,6 +626,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@
 
 ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
 CONF_CC_OPTS += -G0