diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-11-04 15:03:55 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-10 13:16:03 -0500 |
| commit | 9030d8e4dc321dbcd32baae33f150b4e7c8ed141 (patch) | |
| tree | 6876eb9a516566eae34046ad716ea9a7ceea3094 | |
| parent | 816d2e415a32651ed6876c19adb6d33b94c08864 (diff) | |
| download | haskell-9030d8e4dc321dbcd32baae33f150b4e7c8ed141.tar.gz | |
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
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9b0b54949b..70c4447bb9 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 2163643c58..35c492f333 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 |