Skip to content
Snippets Groups Projects
Unverified Commit 975d3d45 authored by Matthew Pickering's avatar Matthew Pickering Committed by Zubin
Browse files

hadrian: Remove special haddock copying rule

(cherry picked from commit 172fd5d1)
parent 0008a303
No related branches found
No related tags found
No related merge requests found
...@@ -39,11 +39,6 @@ It does so by following the steps below. ...@@ -39,11 +39,6 @@ It does so by following the steps below.
to to
<build root>/bindist/ghc-<X>.<Y>.<Z>-<arch>-<os>/docs/ <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 - use autoreconf to generate a `configure` script from
aclocal.m4 and distrib/configure.ac, that we move to: aclocal.m4 and distrib/configure.ac, that we move to:
<build root>/bindist/ghc-<X>.<Y>.<Z>-<arch>-<os>/configure <build root>/bindist/ghc-<X>.<Y>.<Z>-<arch>-<os>/configure
...@@ -146,12 +141,6 @@ bindistRules = do ...@@ -146,12 +141,6 @@ bindistRules = do
-- shipping it -- shipping it
removeFile (bindistFilesDir -/- mingwStamp) 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 -- We then 'need' all the files necessary to configure and install
-- (as in, './configure [...] && make install') this build on some -- (as in, './configure [...] && make install') this build on some
-- other machine. -- other machine.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment