diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-25 16:22:35 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-06-09 13:39:04 -0400 |
| commit | 2ecd2e65d63a652f42ab2e078f4d2ec62660833d (patch) | |
| tree | e6958dc3e8f229ee8cb36a4eff0409a7e1f233cf /hadrian/src/Rules/BinaryDist.hs | |
| parent | d21a587aa17dddafcce3ab9ec1758f1a58d9418f (diff) | |
| download | haskell-2ecd2e65d63a652f42ab2e078f4d2ec62660833d.tar.gz | |
hadrian: Introduce new package database for executables needed to build stage0
These executables (such as hsc2hs) are built using the boot compiler and
crucially, most libraries from the global package database.
We also move other build-time executables to be built in this stage such
as linters which also cleans up which libraries end up in the global
package database. This allows us to remove hacks where linters-common is
removed from the package database when a bindist is created.
This fixes issues caused by infinite recursion due to bytestring adding
a dependency on template-haskell.
Fixes #21634
(cherry picked from commit 5c4421b1a2d45edfc31f2d37c8b4a47c619a424b)
Diffstat (limited to 'hadrian/src/Rules/BinaryDist.hs')
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index 3b5dbca5a6..58dfd58e50 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -204,17 +204,6 @@ bindistRules = do cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["recache"] - -- HACK: Drop stuff from lintersCommon package as this for GHC developers and not of interest to end-users (#21203) - pkg_id <- pkgIdentifier lintersCommon - cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["unregister", pkg_id] - removeDirectory (bindistFilesDir -/- "lib" -/- distDir -/- pkg_id) - - removeFile =<< - ((bindistFilesDir -/- "lib" -/- distDir) -/-) - <$> pkgRegisteredLibraryFileName (Context Stage1 lintersCommon dynamic) - - - -- 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 |