From dc69859572ee176cd5cd885cefaa39532db38b31 Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Fri, 21 Feb 2025 19:58:42 +0000
Subject: [PATCH] hadrian: enable building stage1 haddock for cross ghc
This commit enables building stage1 haddock for cross ghc. Without
this change, hadrian would panic with "Unknown program" error when
building the _build/stage1/bin/cross-prefix-haddock program needed by
the docs-haddock target, even if it only needs to copy from
_build/stage0/bin/cross-prefix-haddock.
(cherry picked from commit 272eaef0be1417f27601616fe002d68dee9708a6)
---
hadrian/src/Settings/Default.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs
index aa138ef54db..9da6e32e418 100644
--- a/hadrian/src/Settings/Default.hs
+++ b/hadrian/src/Settings/Default.hs
@@ -156,6 +156,7 @@ stage1Packages = do
, ghcInternal
, ghcPkg
, ghcPrim
+ , haddock
, haskeline
, hp2ps
, hsc2hs
@@ -174,8 +175,7 @@ stage1Packages = do
, if winTarget then win32 else unix
]
, when (not cross)
- [ haddock
- , hpcBin
+ [ hpcBin
, iserv
, runGhc
, ghcToolchainBin
--
GitLab