diff options
Diffstat (limited to 'hadrian/src/Rules/BinaryDist.hs')
-rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index 43a0f62f8c..8a03064ffd 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -193,6 +193,13 @@ bindistRules = do copyDirectory (ghcBuildDir -/- "lib") bindistFilesDir copyDirectory (rtsIncludeDir) bindistFilesDir + -- The settings file must be regenerated by the bindist installation + -- logic to account for the environment discovered by the bindist + -- configure script on the host. Not on Windows, however, where + -- we do not ship a configure script with the bindist. See #20254. + unless windowsHost $ + removeFile (bindistFilesDir -/- "lib" -/- "settings") + -- Call ghc-pkg recache, after copying so the package.cache is -- accurate, then it's on the distributor to use `cp -a` to install -- a relocatable bindist. |