diff options
| author | Carter Tazio Schonwald <carter.schonwald@gmail.com> | 2014-07-02 08:52:53 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-07-02 08:52:53 -0500 |
| commit | 34f7e9a3c99850859901ca74370f55f1d4e2279a (patch) | |
| tree | e2aa7573d85337837c911f0a815c60570ed945df /aclocal.m4 | |
| parent | 8afe616d52c652db249c4d00b24c82a35ca75068 (diff) | |
| download | haskell-34f7e9a3c99850859901ca74370f55f1d4e2279a.tar.gz | |
Control CPP through settings file (#8683)
Summary:
Allow the CPP program and flag choices for GHC
be configured via the the ghc settings file
Test Plan: ran validate yesterday
Reviewers: hvr, austin, mzero, simonmar
Reviewed By: austin, mzero, simonmar
Subscribers: mzero, simonmar, relrod, carter
Differential Revision: https://phabricator.haskell.org/D26
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 5923e9716b..1a7872eb53 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -454,6 +454,7 @@ AC_DEFUN([FP_SETTINGS], then mingw_bin_prefix=mingw/bin/ SettingsCCompilerCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" + SettingsHaskellCPPCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" SettingsLdCommand="\$topdir/../${mingw_bin_prefix}ld.exe" SettingsArCommand="\$topdir/../${mingw_bin_prefix}ar.exe" SettingsPerlCommand='$topdir/../perl/perl.exe' @@ -462,6 +463,8 @@ AC_DEFUN([FP_SETTINGS], SettingsTouchCommand='$topdir/touchy.exe' else SettingsCCompilerCommand="$WhatGccIsCalled" + SettingsHaskellCPPCommand="$HaskellCPPCmd" + SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="$LdCmd" SettingsArCommand="$ArCmd" SettingsPerlCommand="$PerlCmd" @@ -486,6 +489,8 @@ AC_DEFUN([FP_SETTINGS], SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2" SettingsLdFlags="$CONF_LD_LINKER_OPTS_STAGE2" AC_SUBST(SettingsCCompilerCommand) + AC_SUBST(SettingsHaskellCPPCommand) + AC_SUBST(SettingsHaskellCPPFlags) AC_SUBST(SettingsCCompilerFlags) AC_SUBST(SettingsCCompilerLinkFlags) AC_SUBST(SettingsLdCommand) @@ -706,6 +711,8 @@ AC_ARG_WITH($2, ) ]) # FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL + + # FP_PROG_CONTEXT_DIFF # -------------------- # Figure out how to do context diffs. Sets the output variable ContextDiffCmd. @@ -2101,4 +2108,6 @@ AC_DEFUN([MAYBE_OVERRIDE_STAGE0],[ fi ]) + + # LocalWords: fi |