[Git][ghc/ghc][wip/backports-9.4] 2 commits: compiler: Ensure that GHC toolchain is first in search path

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/backports-9.4 at Glasgow Haskell Compiler / GHC


Commits:
34d1f0fb by Ben Gamari at 2022-12-23T10:30:21-05:00
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).

(cherry picked from commit 8071efc307ba2df7362ff3b96c898afc61addc21)

- - - - -
cafe7594 by Ben Gamari at 2022-12-23T10:31:33-05:00
docs/relnotes: Mention #22561

- - - - -


3 changed files:

- compiler/GHC/Settings/IO.hs
- docs/users_guide/9.4.4-notes.rst
- m4/fp_settings.m4


Changes:

=====================================
compiler/GHC/Settings/IO.hs
=====================================
@@ -79,11 +79,11 @@ initSettings top_dir = do
   myExtraGccViaCFlags <- getSetting "GCC extra via C opts"
   cc_prog <- getToolSetting "C compiler command"
   cxx_prog <- getToolSetting "C++ compiler command"
-  cc_args_str <- getSetting "C compiler flags"
-  cxx_args_str <- getSetting "C++ compiler flags"
+  cc_args_str <- getToolSetting "C compiler flags"
+  cxx_args_str <- getToolSetting "C++ compiler flags"
   gccSupportsNoPie <- getBooleanSetting "C compiler supports -no-pie"
   cpp_prog <- getToolSetting "Haskell CPP command"
-  cpp_args_str <- getSetting "Haskell CPP flags"
+  cpp_args_str <- getToolSetting "Haskell CPP flags"
 
   platform <- either pgmError pure $ getTargetPlatform settingsFile mySettings
 
@@ -125,13 +125,13 @@ initSettings top_dir = do
 
 
   -- Other things being equal, as and ld are simply gcc
-  cc_link_args_str <- getSetting "C compiler link flags"
+  cc_link_args_str <- getToolSetting "C compiler link flags"
   let   as_prog  = cc_prog
         as_args  = map Option cc_args
         ld_prog  = cc_prog
         ld_args  = map Option (cc_args ++ words cc_link_args_str)
   ld_r_prog <- getToolSetting "Merge objects command"
-  ld_r_args <- getSetting "Merge objects flags"
+  ld_r_args <- getToolSetting "Merge objects flags"
   let ld_r
         | null ld_r_prog = Nothing
         | otherwise      = Just (ld_r_prog, map Option $ words ld_r_args)


=====================================
docs/users_guide/9.4.4-notes.rst
=====================================
@@ -20,6 +20,7 @@ Issues fixed in this release include:
 * Fix the :ghc-flag:`-fdefer-diagnostics`. (:ghc-ticket:`22391`)
 * Fixes to several subtle compiler panics. (:ghc-ticket:`22491`, :ghc-ticket:`22416`, :ghc-ticket:`22549`, :ghc-ticket:`22475`, :ghc-ticket:`22039`)
 * Add correct write barries to IORef operations. (:ghc-ticket:`22468`)
+* The toolchain provided with Windows binary distributions now searches for its own headers and libraries before those of the host system's msys2 installation (:ghc-ticket:`22561`)
 
 
 Included libraries


=====================================
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)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0476f4e64c9151d18854844a8803b27781da447b...cafe75946c465dd20c324918807464e09f12ac2f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0476f4e64c9151d18854844a8803b27781da447b...cafe75946c465dd20c324918807464e09f12ac2f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221223/a7207e31/attachment-0001.html>