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
Container 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
Luite Stegeman
GHC
Commits
a8defd8a
Commit
a8defd8a
authored
13 years ago
by
Ian Lynagh
Browse files
Options
Downloads
Patches
Plain Diff
Fix building of optional packages
The change to the packages file format broke it
parent
8f1523e9
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages
+4
-1
4 additions, 1 deletion
packages
rules/extra-packages.mk
+1
-1
1 addition, 1 deletion
rules/extra-packages.mk
with
5 additions
and
2 deletions
packages
+
4
−
1
View file @
a8defd8a
# Despite the name "package", this file contains the master list of
# the *repositories* that make up GHC. It is parsed by boot and sync-all.
# the *repositories* that make up GHC. It is parsed by
# * boot
# * sync-all
# * rules/extra-packages.mk
#
# Some of this information is duplicated elsewhere in the build system:
# See Trac #3896
...
...
This diff is collapsed.
Click to expand it.
rules/extra-packages.mk
+
1
−
1
View file @
a8defd8a
...
...
@@ -27,7 +27,7 @@
# add P to the list of packages
define
extra-packages
$
$(
foreach
p,
$$(
patsubst libraries/%,%,
$$(
wildcard
$$(
shell
grep
'^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+
\+[^ ]\+
'
packages |
sed
's/ .*//'
)))
,
\
$
$(
foreach
p,
$$(
patsubst libraries/%,%,
$$(
wildcard
$$(
shell
grep
'^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+
$$$$
'
packages |
sed
's/ .*//'
)))
,
\
$$(
if
$$(
wildcard libraries/
$$
p/ghc-packages
)
,
\
$$(
eval
BUILD_DIRS +
=
libraries/
$$
p
)
\
$$(
foreach q,
$$(
shell
cat
libraries/
$$
p/ghc-packages2
)
,
$$(
eval
$$(
call extra-package,
$$
p,
$$
p/
$$
q
)))
,
\
...
...
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