diff options
| author | Ben Gamari <ben@well-typed.com> | 2022-12-14 17:15:08 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-12-24 00:41:05 -0500 |
| commit | 5eb357d905c63cfbe6287a99fbaa8d83289d1a22 (patch) | |
| tree | 7d44ccf527f093987fa9eee1e3f24a8b71c2e726 /m4 | |
| parent | aebef31cd8857749c7e25fe4b0d3ce4e12ae225a (diff) | |
| download | haskell-5eb357d905c63cfbe6287a99fbaa8d83289d1a22.tar.gz | |
compiler: Ensure that GHC toolchain is first in search path
As noted in #22561, it is important that GHC's toolchain look
first for its own headers and libraries to ensure that the
system's are not found instead. If this happens things can
break in surprising ways (e.g. see #22561).
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/fp_settings.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/fp_settings.m4 b/m4/fp_settings.m4 index 0b75cf8d35..d179e1013a 100644 --- a/m4/fp_settings.m4 +++ b/m4/fp_settings.m4 @@ -10,12 +10,12 @@ AC_DEFUN([FP_SETTINGS], # See Note [tooldir: How GHC finds mingw on Windows] mingw_bin_prefix='$$tooldir/mingw/bin/' SettingsCCompilerCommand="${mingw_bin_prefix}clang.exe" - SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2" + SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 -I$$tooldir/mingw/include" SettingsCxxCompilerCommand="${mingw_bin_prefix}clang++.exe" - SettingsCxxCompilerFlags="$CONF_CXX_OPTS_STAGE2" - SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2" + SettingsCxxCompilerFlags="$CONF_CXX_OPTS_STAGE2 -I$$tooldir/mingw/include" + SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2 -L$$tooldir/mingw/lib -L$$tooldir/mingw/x86_64-w64-mingw32/lib" SettingsHaskellCPPCommand="${mingw_bin_prefix}clang.exe" - SettingsHaskellCPPFlags="$HaskellCPPArgs" + SettingsHaskellCPPFlags="$HaskellCPPArgs -I$$tooldir/mingw/include" SettingsLdCommand="${mingw_bin_prefix}ld.lld.exe" SettingsLdFlags="" # LLD does not support object merging (#21068) |