[Git][ghc/ghc][wip/inplace-final] Revert "Add some more packages to multi-cradle"

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/inplace-final at Glasgow Haskell Compiler / GHC


Commits:
a76f915e by Matthew Pickering at 2022-08-22T17:26:16+01:00
Revert "Add some more packages to multi-cradle"

This reverts commit 96ee4385326312be13480b16bb05241f70435e48.

Broken on 9.0.2

- - - - -


2 changed files:

- hadrian/src/Rules/ToolArgs.hs
- hadrian/src/Settings/Builders/Ghc.hs


Changes:

=====================================
hadrian/src/Rules/ToolArgs.hs
=====================================
@@ -79,6 +79,8 @@ multiSetup pkg_s = do
                           (Ghc ToolArgs stage0InTree) [] ["ignored"]
       arg_list <- interpret fake_target getArgs
       let c = Context stage0InTree p (if windowsHost then vanilla else dynamic) Inplace -- Critical use of Inplace, one of the main motivations!
+      -- readContextData has the effect of configuring the package so all
+      -- dependent packages will also be built.
       cd <- readContextData c
       srcs <- hsSources c
       gens <- interpretInContext c generatedDependencies
@@ -152,17 +154,17 @@ toolTargets = [ binary
               , directory
               , process
               , exceptions
-              -- , ghc     -- # depends on ghc library
-              -- , runGhc  -- # depends on ghc library
+--            , ghc     # depends on ghc library
+--            , runGhc  # depends on ghc library
               , ghcBoot
               , ghcBootTh
               , ghcHeap
               , ghci
-              , ghcPkg  -- # executable
-              -- , haddock -- # depends on ghc library
-              , hsc2hs  -- # executable
+--            , ghcPkg  # executable
+--            , haddock # depends on ghc library
+--            , hsc2hs  # executable
               , hpc
-              , hpcBin  -- # executable
+--            , hpcBin  # executable
               , mtl
               , parsec
               , time
@@ -170,7 +172,7 @@ toolTargets = [ binary
               , text
               , terminfo
               , transformers
-              , unlit  -- # executable
+--            , unlit  # executable
               ] ++ if windowsHost then [ win32 ] else [ unix ]
 
 -- | Create a mapping from files to which component it belongs to.


=====================================
hadrian/src/Settings/Builders/Ghc.hs
=====================================
@@ -250,7 +250,7 @@ packageGhcArgs = do
             , arg "-no-user-package-db"
             , arg "-package-env -"
             , packageDatabaseArgs
-            , arg ("-this-unit-id " ++ pkgId)
+            , libraryPackage ? arg ("-this-unit-id " ++ pkgId)
             , map ("-package-id " ++) <$> getContextData depIds ]
 
 includeGhcArgs :: Args



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a76f915ed981bfeef2ec4c8f5dced21d41edebd2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a76f915ed981bfeef2ec4c8f5dced21d41edebd2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220822/0ff0ec20/attachment-0001.html>