GitLab

Rodrigo Mesquita pushed to branch wip/T23675 at Glasgow Haskell Compiler / GHC

Commits:

51837035

by Rodrigo Mesquita at 2025-06-17T11:26:31+01:00

hadrian: Use settings-use-distro-mingw directly

The type `ToolchainSetting` only made sense when we had more settings to
fetch from the system config file. Even then "settings-use-distro-mingw"
is arguably not a toolchain setting.

With the fix for #23675, all toolchain tools were moved to the
`ghc-toolchain` `Toolchain` format. Therefore, we can inline
`settings-use-distro-mingw` accesses and delete `ToolchainSetting`.

3 changed files:

hadrian/src/Builder.hs
hadrian/src/Oracles/Setting.hs
hadrian/src/Rules/Generate.hs

Changes:

hadrian/src/Builder.hs

@@ -34,7 +34,6 @@ import Base
  import Context
  import Oracles.Flag
  import Oracles.Setting (setting, Setting(..))
 -import Oracles.Setting (settingsFileSetting, ToolchainSetting(..))
  import Packages
  import GHC.IO.Encoding (getFileSystemEncoding)
@@ -240,7 +239,7 @@ instance H.Builder Builder where
          Ghc _ st -> do
              root <- buildRoot
              unlitPath  <- builderPath Unlit
 -            distro_mingw <- settingsFileSetting ToolchainSetting_DistroMinGW
 +            distro_mingw <- lookupSystemConfig "settings-use-distro-mingw"
              libffi_adjustors <- useLibffiForAdjustors
              use_system_ffi <- flag UseSystemFfi

hadrian/src/Oracles/Setting.hs

@@ -75,19 +75,6 @@ data Setting = CursesIncludeDir
               | BourneShell
               | EmsdkVersion
 --- TODO compute solely in Hadrian, removing these variables' definitions
 --- from aclocal.m4 whenever they can be calculated from other variables
 --- already fed into Hadrian.
+-
 --- | All 'ToolchainSetting's are computed by the ghc-toolchain utility for configuring toolchains.
 --- This used to be defined by 'FP_SETTINGS' in aclocal.m4.
 ---
 --- TODO: We should be able to drop this completely, after moving all the toolchain settings to ghc-toolchain
 --- Move to ghc-toolchain and to the Target files generated by configure and ghc-toolchain
 --- * First we will get rid of DistroMinGW when we fix the windows build
 -data ToolchainSetting
 -    = ToolchainSetting_DistroMinGW
+-
  -- | Look up the value of a 'Setting' in @cfg/system.config@, tracking the
  -- result.
  setting :: Setting -> Action String
@@ -128,14 +115,6 @@ setting key = lookupSystemConfig $ case key of
      BourneShell        -> "bourne-shell"
      EmsdkVersion       -> "emsdk-version"
 --- | Look up the value of a 'SettingList' in @cfg/system.config@, tracking the
 --- result.
 --- See Note [tooldir: How GHC finds mingw on Windows]
 --- ROMES:TODO: This should be queryTargetTargetConfig
 -settingsFileSetting :: ToolchainSetting -> Action String
 -settingsFileSetting key = lookupSystemConfig $ case key of
 -    ToolchainSetting_DistroMinGW            -> "settings-use-distro-mingw" -- ROMES:TODO: This option doesn't seem to be in ghc-toolchain yet. It corresponds to EnableDistroToolchain
+-
  -- | An expression that looks up the value of a 'Setting' in @cfg/system.config@,
  -- tracking the result.
  getSetting :: Setting -> Expr c b String

hadrian/src/Rules/Generate.hs

@@ -424,7 +424,7 @@ bindistRules = do
      , interpolateSetting "LlvmMinVersion" LlvmMinVersion
      , interpolateVar "LlvmTarget" $ getTarget tgtLlvmTarget
      , interpolateSetting "ProjectVersion" ProjectVersion
 -    , interpolateVar "SettingsUseDistroMINGW" $ settingsFileSetting ToolchainSetting_DistroMinGW
 +    , interpolateVar "SettingsUseDistroMINGW" $ lookupSystemConfig "settings-use-distro-mingw"
      , interpolateVar "TablesNextToCode" $ yesNo <$> getTarget tgtTablesNextToCode
      , interpolateVar "TargetHasLibm" $ lookupSystemConfig "target-has-libm"
      , interpolateVar "TargetPlatform" $ getTarget targetPlatformTriple
@@ -529,7 +529,7 @@ generateSettings settingsFile = do
          , ("LLVM opt command", queryTarget optPath)
          , ("LLVM llvm-as command", queryTarget llvmAsPath)
          , ("LLVM llvm-as flags", queryTarget llvmAsFlags)
 -        , ("Use inplace MinGW toolchain", expr $ settingsFileSetting ToolchainSetting_DistroMinGW)
 +        , ("Use inplace MinGW toolchain", expr $ lookupSystemConfig "settings-use-distro-mingw")
          , ("target RTS linker only supports shared libraries", expr $ yesNo <$> targetRTSLinkerOnlySupportsSharedLibs)
          , ("Use interpreter", expr $ yesNo <$> ghcWithInterpreter (predStage stage))