diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-14 10:21:34 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-24 01:55:24 -0400 |
| commit | a0ea59d641d400543e9e803007500da01eedf48a (patch) | |
| tree | d5b817282db575326a3745fd089f3d86a752ff1d /hadrian | |
| parent | e0eda0707d6cc3d5a85cfb13543df61623e82070 (diff) | |
| download | haskell-a0ea59d641d400543e9e803007500da01eedf48a.tar.gz | |
Move Config module into GHC.Settings
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 4 | ||||
| -rw-r--r-- | hadrian/src/Rules/ToolArgs.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index b332713222..689e0fdd3f 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -114,7 +114,7 @@ generatePackageCode context@(Context stage pkg _) = do priority 2.0 $ do when (pkg == compiler) $ do - root -/- "**" -/- dir -/- "Config.hs" %> go generateConfigHs + root -/- "**" -/- dir -/- "GHC/Settings/Config.hs" %> go generateConfigHs root -/- "**" -/- dir -/- "*.hs-incl" %> genPrimopCode context when (pkg == ghcPrim) $ do root -/- "**" -/- dir -/- "GHC/Prim.hs" %> genPrimopCode context @@ -346,7 +346,7 @@ generateConfigHs = do cBooterVersion <- getSetting GhcVersion return $ unlines [ "{-# LANGUAGE CPP #-}" - , "module Config" + , "module GHC.Settings.Config" , " ( module GHC.Version" , " , cBuildPlatformString" , " , cHostPlatformString" diff --git a/hadrian/src/Rules/ToolArgs.hs b/hadrian/src/Rules/ToolArgs.hs index ef75c49d15..8277d580fa 100644 --- a/hadrian/src/Rules/ToolArgs.hs +++ b/hadrian/src/Rules/ToolArgs.hs @@ -68,7 +68,7 @@ allDeps = do root <- buildRoot let dir = buildDir (vanillaContext Stage0 compiler) - need [ root -/- dir -/- "Config.hs" ] + need [ root -/- dir -/- "GHC" -/- "Settings" -/- "Config.hs" ] need [ root -/- dir -/- "GHC" -/- "Parser.hs" ] need [ root -/- dir -/- "GHC" -/- "Parser" -/- "Lexer.hs" ] need [ root -/- dir -/- "GHC" -/- "Cmm" -/- "Parser.hs" ] |