From 975d3d453d17ce9b4cc3a993677bd4a01a97a3a0 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 7 Jul 2021 09:08:27 +0100
Subject: [PATCH] hadrian: Remove special haddock copying rule
(cherry picked from commit 172fd5d1b2a88ce77a6d75ca0d96e5b28ad59f7c)
---
hadrian/src/Rules/BinaryDist.hs | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs
index 50654f423dfe..eebe6e935561 100644
--- a/hadrian/src/Rules/BinaryDist.hs
+++ b/hadrian/src/Rules/BinaryDist.hs
@@ -39,11 +39,6 @@ It does so by following the steps below.
to
<build root>/bindist/ghc-<X>.<Y>.<Z>-<arch>-<os>/docs/
-- copy haddock (built by our stage2 compiler):
- <build root>/stage2/bin/haddock
- to
- <build root>/bindist/ghc-<X>.<Y>.<Z>-<arch>-<os>/bin/haddock
-
- use autoreconf to generate a `configure` script from
aclocal.m4 and distrib/configure.ac, that we move to:
<build root>/bindist/ghc-<X>.<Y>.<Z>-<arch>-<os>/configure
@@ -146,12 +141,6 @@ bindistRules = do
-- shipping it
removeFile (bindistFilesDir -/- mingwStamp)
- -- We copy the binary (<build root>/stage1/bin/haddock[.exe]) to
- -- the bindist's bindir (<build root>/bindist/ghc-.../bin/).
- haddockPath <- programPath (vanillaContext Stage1 haddock)
- copyFile haddockPath
- (bindistFilesDir -/- "bin" -/- takeFileName haddockPath)
-
-- We then 'need' all the files necessary to configure and install
-- (as in, './configure [...] && make install') this build on some
-- other machine.
--
GitLab