Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexander Kaznacheev
GHC
Commits
975d3d45
Unverified
Commit
975d3d45
authored
4 years ago
by
Matthew Pickering
Committed by
Zubin
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hadrian/src/Rules/BinaryDist.hs
+0
-11
0 additions, 11 deletions
hadrian/src/Rules/BinaryDist.hs
with
0 additions
and
11 deletions
hadrian/src/Rules/BinaryDist.hs
+
0
−
11
View file @
975d3d45
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment