diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-12-24 15:59:28 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-12-24 16:02:13 -0500 |
| commit | 7856ad20d1fe303907c0bee7d376a1e4bf9f24c3 (patch) | |
| tree | d3b2d28d3a82da6545213f8a0275bc20cb4f55e8 | |
| parent | 6d62f6bfbb5a86131e7cbc30993f3fa510d8b3ab (diff) | |
| download | haskell-wip/T22561.tar.gz | |
configure: Fix escaping of `$tooldir`wip/T22561
In !9547 I introduced `$tooldir` directories into GHC's default link and
compilation flags to ensure that our C toolchain finds its own headers
and libraries before others on the system. However, the patch was subtly
wrong in the escaping of `$tooldir`. Fix this.
Fixes #22561.
| -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 d179e1013a..26e15a163c 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 -I$$tooldir/mingw/include" + SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 -I\$\$tooldir/mingw/include" SettingsCxxCompilerCommand="${mingw_bin_prefix}clang++.exe" - 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" + 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 -I$$tooldir/mingw/include" + SettingsHaskellCPPFlags="$HaskellCPPArgs -I\$\$tooldir/mingw/include" SettingsLdCommand="${mingw_bin_prefix}ld.lld.exe" SettingsLdFlags="" # LLD does not support object merging (#21068) |