diff options
| author | Adam Sandberg Ericsson <adam@sandbergericsson.se> | 2020-07-15 18:21:53 +0100 |
|---|---|---|
| committer | Adam Sandberg Ericsson <adam@sandbergericsson.se> | 2020-08-09 11:32:25 +0200 |
| commit | a11c9678409b2e0a01e8aba153e094800f3641bf (patch) | |
| tree | a1e881cdf921ce2fb19d42028ee467773d7178f3 | |
| parent | 8a665db6174eaedbbae925c0ccb4c22b3f29bcaf (diff) | |
| download | haskell-a11c9678409b2e0a01e8aba153e094800f3641bf.tar.gz | |
hadrian: depend on boot compiler version #18001
| -rw-r--r-- | hadrian/src/Builder.hs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs index 7624ae91ad..072a2edd73 100644 --- a/hadrian/src/Builder.hs +++ b/hadrian/src/Builder.hs @@ -30,6 +30,7 @@ import Hadrian.Utilities import Base import Context import Oracles.Flag +import Oracles.Setting (setting, Setting(..)) import Packages -- | C compiler can be used in two different modes: @@ -180,7 +181,11 @@ instance H.Builder Builder where Autoreconf dir -> return [dir -/- "configure.ac"] Configure dir -> return [dir -/- "configure"] - Ghc _ Stage0 -> includesDependencies Stage0 + Ghc _ Stage0 -> do + -- Read the boot GHC version here to make sure we rebuild when it + -- changes (#18001). + _bootGhcVersion <- setting GhcVersion + includesDependencies Stage0 Ghc _ stage -> do root <- buildRoot touchyPath <- programPath (vanillaContext Stage0 touchy) |