[Git][ghc/ghc][wip/hadrian-cross-stage2] Don't build genapply for javascript backend

[Matthew Pickering (@mpickering)]

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


Commits:
ca0ba472 by GHC GitLab CI at 2023-11-15T11:06:57+00:00
Don't build genapply for javascript backend

- - - - -


2 changed files:

- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Settings/Default.hs


Changes:

=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -153,10 +153,13 @@ buildBinDistDir root conf at BindistConfig{..} = do
     lib_pkgs <- stagePackages library_stage
     (lib_targets, _) <- partitionEithers <$> mapM (pkgTarget conf) lib_pkgs
 
-    bin_pkgs <- stagePackages executable_stage
+    bin_pkgs_all <- stagePackages executable_stage
+    -- Things we don't want to distribute ever
+    let excluded_packages = [ genapply ]
+        bin_pkgs = filter (`notElem` excluded_packages) bin_pkgs_all
     (_, bin_targets) <- partitionEithers <$> mapM (pkgTarget conf) bin_pkgs
 
-    liftIO $ print (library_stage, executable_stage, lib_targets, bin_targets)
+
 
 
     cross <- flag CrossCompiling


=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -131,6 +131,7 @@ 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
 
@@ -160,9 +161,10 @@ stage1Packages = do
         , xhtml
         , haddock
         , hpcBin
-        , genapply
         , if winTarget then win32 else unix
         ] ++
+        [ genapply | not jsTarget ]
+	++
         [ iserv
         , runGhc
         , ghcToolchainBin



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ca0ba472fb138438309358891b18267506d7a512
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/20231115/efbe68a1/attachment-0001.html>