diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-07-07 14:25:44 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-25 00:45:08 -0400 |
| commit | 459afeb592d5ff6d338184f5ef248758ecda57a4 (patch) | |
| tree | dc667acef485c06485bc53a5b4bde3f4595d53b5 /hadrian | |
| parent | 7721b923d53fb9eb93f80bb93b4c3bd976c05b4c (diff) | |
| download | haskell-459afeb592d5ff6d338184f5ef248758ecda57a4.tar.gz | |
Fix build systems
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 10 | ||||
| -rw-r--r-- | hadrian/src/Settings/Builders/DeriveConstants.hs | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 7a51814b07..850bb87de4 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -43,9 +43,7 @@ ghcPrimDependencies = do derivedConstantsFiles :: [FilePath] derivedConstantsFiles = [ "DerivedConstants.h" - , "GHCConstantsHaskellExports.hs" - , "GHCConstantsHaskellType.hs" - , "GHCConstantsHaskellWrappers.hs" ] + ] compilerDependencies :: Expr [FilePath] compilerDependencies = do @@ -71,7 +69,9 @@ compilerDependencies = do , "primop-vector-tys-exports.hs-incl" , "primop-vector-tys.hs-incl" , "primop-vector-uniques.hs-incl" - , "primop-docs.hs-incl" ] ] + , "primop-docs.hs-incl" + , "GHC/Platform/Constants.hs" + ] ] generatedDependencies :: Expr [FilePath] generatedDependencies = do @@ -111,6 +111,7 @@ generatePackageCode context@(Context stage pkg _) = do priority 2.0 $ do when (pkg == compiler) $ do + root -/- "**" -/- dir -/- "GHC/Platform/Constants.hs" %> genPlatformConstantsType context root -/- "**" -/- dir -/- "GHC/Settings/Config.hs" %> go generateConfigHs root -/- "**" -/- dir -/- "*.hs-incl" %> genPrimopCode context when (pkg == ghcPrim) $ do @@ -119,7 +120,6 @@ generatePackageCode context@(Context stage pkg _) = do when (pkg == ghcBoot) $ do root -/- "**" -/- dir -/- "GHC/Version.hs" %> go generateVersionHs root -/- "**" -/- dir -/- "GHC/Platform/Host.hs" %> go generatePlatformHostHs - root -/- "**" -/- dir -/- "GHC/Platform/Constants.hs" %> genPlatformConstantsType context when (pkg == compiler) $ do root -/- primopsTxt stage %> \file -> do diff --git a/hadrian/src/Settings/Builders/DeriveConstants.hs b/hadrian/src/Settings/Builders/DeriveConstants.hs index de548b41ff..be115fb789 100644 --- a/hadrian/src/Settings/Builders/DeriveConstants.hs +++ b/hadrian/src/Settings/Builders/DeriveConstants.hs @@ -8,10 +8,7 @@ import Settings.Builders.Common deriveConstantsPairs :: [(String, String)] deriveConstantsPairs = [ ("DerivedConstants.h", "--gen-header") - , ("GHCConstantsHaskellType.hs", "--gen-haskell-type") , ("platformConstants", "--gen-haskell-value") - , ("GHCConstantsHaskellWrappers.hs", "--gen-haskell-wrappers") - , ("GHCConstantsHaskellExports.hs", "--gen-haskell-exports") ] -- TODO: do we need to support `includes_CC_OPTS += -DDYNAMIC_BY_DEFAULT`? |