[Git][ghc/ghc][wip/cross-stage2-rebased] Fix genapply

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/cross-stage2-rebased at Glasgow Haskell Compiler / GHC


Commits:
8d15c356 by Matthew Pickering at 2024-03-04T16:59:24+00:00
Fix genapply

- - - - -


1 changed file:

- hadrian/src/Settings/Default.hs


Changes:

=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -73,6 +73,7 @@ stageBootPackages = return
   , deriveConstants
   , genprimopcode
   , unlit
+  , genapply
   ]
 
 -- | Packages built in 'Stage0' by default. You can change this in "UserSettings".
@@ -112,7 +113,6 @@ stage0Packages = do
              , transformers
              , unlit
              , hp2ps
-             , genapply
              , if windowsHost then win32 else unix
              ]
           ++ [ terminfo | not windowsHost, not cross ]
@@ -132,7 +132,6 @@ stage1Packages = do
     libraries0 <- filter good_stage0_package <$> stage0Packages
     cross      <- flag CrossCompiling
     winTarget  <- isWinTarget Stage1
-    jsTarget   <- isJsTarget Stage2
 
     let when c xs = if c then xs else mempty
 
@@ -164,8 +163,6 @@ stage1Packages = do
         , hpcBin
         , if winTarget then win32 else unix
         ] ++
-        [ genapply | not jsTarget ]
-        ++
         [ iserv
         , runGhc
         , ghcToolchainBin



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8d15c356d39773c1257dfc89dfb4e72ba4f4ce29
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/20240304/5ca43ef0/attachment-0001.html>