diff options
Diffstat (limited to 'hadrian/src/Rules/BinaryDist.hs')
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index f0aeb4b827..667fbf1454 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -19,14 +19,14 @@ bindistRules = do need targets version <- setting ProjectVersion targetPlatform <- setting TargetPlatformFull - hostOs <- setting BuildOs - hostArch <- setting BuildArch + cabalHostOs <- cabalOsString <$> setting BuildOs + cabalHostArch <- cabalArchString <$> setting BuildArch rtsDir <- pkgIdentifier rts let ghcBuildDir = root -/- stageString Stage1 bindistFilesDir = root -/- "bindist" -/- ghcVersionPretty ghcVersionPretty = "ghc-" ++ version ++ "-" ++ targetPlatform - distDir = hostArch ++ "-" ++ hostOs ++ "-ghc-" ++ version + distDir = cabalHostArch ++ "-" ++ cabalHostOs ++ "-ghc-" ++ version rtsIncludeDir = ghcBuildDir -/- "lib" -/- distDir -/- rtsDir -/- "include" |