[Git][ghc/ghc][wip/toolchain-selection] ROMES: WIP 5

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC


Commits:
a566a0ec by Rodrigo Mesquita at 2023-05-22T17:05:42+01:00
ROMES: WIP 5

- - - - -


5 changed files:

- compiler/GHC/Driver/Main.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- hadrian/src/Rules/Generate.hs
- hadrian/src/Settings/Builders/Ghc.hs
- hadrian/src/Settings/Builders/Hsc2Hs.hs


Changes:

=====================================
compiler/GHC/Driver/Main.hs
=====================================
@@ -109,9 +109,6 @@ module GHC.Driver.Main
 
 import GHC.Prelude
 
-import GHC.Platform
-import GHC.Platform.Ways
-
 import GHC.Driver.Plugins
 import GHC.Driver.Session
 import GHC.Driver.Backend


=====================================
compiler/GHC/Driver/Pipeline/Execute.hs
=====================================
@@ -288,7 +288,6 @@ runAsPhase :: Bool -> PipeEnv -> HscEnv -> Maybe ModLocation -> FilePath -> IO F
 runAsPhase with_cpp pipe_env hsc_env location input_fn = do
         let dflags     = hsc_dflags   hsc_env
         let logger     = hsc_logger   hsc_env
-        let unit_env   = hsc_unit_env hsc_env
 
         let cmdline_include_paths = includePaths dflags
         let pic_c_flags = picCCOpts dflags


=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -431,7 +431,7 @@ generateSettings = do
         , ("ld command", expr $ settingsFileSetting ToolchainSetting_LdCommand)
         , ("ld flags", expr $ settingsFileSetting ToolchainSetting_LdFlags)
         , ("ld supports compact unwind", expr $ queryTargetTargetConfig linkSupportsCompactUnwind)
-        , ("ld supports filelist", expr $ queryTargetTargetConfig ldSupportsFilelist)
+        , ("ld supports filelist", expr $ queryTargetTargetConfig linkSupportsFilelist)
         , ("ld supports response files", expr $ queryTargetTargetConfig linkSupportsResponseFiles)
         , ("ld is GNU ld", expr $ queryTargetTargetConfig linkIsGnu)
         , ("Merge objects command", expr $ settingsFileSetting ToolchainSetting_MergeObjectsCommand)


=====================================
hadrian/src/Settings/Builders/Ghc.hs
=====================================
@@ -14,7 +14,7 @@ import Rules.Libffi (libffiName)
 import qualified Data.Set as Set
 import System.Directory
 import Data.Version.Extra
-import GHC.Toolchain (ccProgram, tgtCCompiler, cppProgram, tgtCPreprocessor)
+import GHC.Toolchain (ccProgram, tgtCCompiler)
 import GHC.Toolchain.Program
 
 ghcBuilderArgs :: Args
@@ -294,6 +294,3 @@ includeGhcArgs = do
 -- Utilities
 getStagedCCFlags :: Args
 getStagedCCFlags = prgFlags . ccProgram . tgtCCompiler <$> getStagedTargetConfig
-
-getStagedCPPFlags :: Args
-getStagedCPPFlags = prgFlags . cppProgram . tgtCPreprocessor <$> getStagedTargetConfig


=====================================
hadrian/src/Settings/Builders/Hsc2Hs.hs
=====================================
@@ -5,7 +5,7 @@ import Hadrian.Haskell.Cabal.Type
 import Builder
 import Packages
 import Settings.Builders.Common
-import GHC.Toolchain (tgtCCompiler, ccProgram, tgtCPreprocessor, cppProgram, tgtCCompilerLink, ccLinkProgram)
+import GHC.Toolchain (tgtCCompiler, ccProgram, tgtCCompilerLink, ccLinkProgram)
 import GHC.Toolchain.Program
 
 hsc2hsBuilderArgs :: Args



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a566a0ecc90cf718d9ba1ee88e5b0ada9312fe66

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a566a0ecc90cf718d9ba1ee88e5b0ada9312fe66
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/20230522/bec4cbdc/attachment-0001.html>