diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-20 21:24:33 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-24 15:22:17 -0400 |
| commit | 15ccca16e2ecdde0a4e646c6d7515e00a7f364d3 (patch) | |
| tree | 56f524159362e55a240c6d8555a1542f256f9a5b | |
| parent | 7a07aa718110071ee30eebadf0b4b372e8e7fc8e (diff) | |
| download | haskell-15ccca16e2ecdde0a4e646c6d7515e00a7f364d3.tar.gz | |
Hadrian: fix distDir per stage
| -rw-r--r-- | hadrian/src/Context.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hadrian/src/Context.hs b/hadrian/src/Context.hs index 6e1d84de4b..c7d321eba9 100644 --- a/hadrian/src/Context.hs +++ b/hadrian/src/Context.hs @@ -55,9 +55,12 @@ libPath Context {..} = buildRoot <&> (-/- (stageString stage -/- "lib")) -- conventions (see 'cabalOsString' and 'cabalArchString'). distDir :: Stage -> Action FilePath distDir st = do + let (os,arch) = case st of + Stage0 -> (HostOs , HostArch) + _ -> (TargetOs, TargetArch) version <- ghcVersionStage st - hostOs <- cabalOsString <$> setting BuildOs - hostArch <- cabalArchString <$> setting BuildArch + hostOs <- cabalOsString <$> setting os + hostArch <- cabalArchString <$> setting arch return $ hostArch ++ "-" ++ hostOs ++ "-ghc-" ++ version pkgFileName :: Package -> String -> String -> Action FilePath |