diff options
Diffstat (limited to 'hadrian/src/Rules/Generate.hs')
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index c65d852931..89642896a6 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -15,7 +15,6 @@ import Oracles.Flag import Oracles.ModuleFiles import Oracles.Setting import Packages -import Rules.Gmp import Rules.Libffi import Settings import Settings.Builders.DeriveConstants (deriveConstantsPairs) @@ -53,11 +52,11 @@ compilerDependencies = do stage <- getStage isGmp <- (== integerGmp) <$> getIntegerPackage ghcPath <- expr $ buildPath (vanillaContext stage compiler) - gmpPath <- expr gmpBuildPath + gmpPath <- expr $ buildPath (vanillaContext stage integerGmp) rtsPath <- expr (rtsBuildPath stage) libDir <- expr $ stageLibPath stage mconcat [ return $ (libDir -/-) <$> derivedConstantsFiles - , notStage0 ? isGmp ? return [gmpPath -/- gmpLibraryH] + , notStage0 ? isGmp ? return [gmpPath -/- "include/ghc-gmp.h"] , notStage0 ? return ((rtsPath -/-) <$> libffiHeaderFiles) , return $ fmap (ghcPath -/-) [ "primop-can-fail.hs-incl" |