diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-22 12:01:00 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-22 12:01:00 +0200 |
| commit | 33e585d6eacae19e83862a05b650373b536095fa (patch) | |
| tree | 87894157f4caebefc6856e58d232f1a7d0dddbbc /rules | |
| parent | c6a31d2d53f45ce0432296196340d0400d921eb7 (diff) | |
| download | haskell-33e585d6eacae19e83862a05b650373b536095fa.tar.gz | |
Handle base et al. specially in foreachLibrary.mk
This adapts the foreachLibrary rule to match the new situation of
base.git, ghc-prim.git, integer-gmp.git, integer-simple.git, and
template-haskell.git being folded into ghc.git (re #9016), and thus
not being mentioned anymore in the `packages` file.
One visible effect of this oversight was that the `clean_libraries`
make target would fail to clean those packages.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/foreachLibrary.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/rules/foreachLibrary.mk b/rules/foreachLibrary.mk index b2353a0ac3..cdd54962db 100644 --- a/rules/foreachLibrary.mk +++ b/rules/foreachLibrary.mk @@ -23,13 +23,26 @@ # We use an FEL_ prefix for the variable names, to avoid trampling on # other variables, as make has no concept of local variables. -# We need to handle bin-package-db specially, as it doesn't have an -# entry in the packages file, as it isn't in its own repository. +# We need to handle the following packages specially, as those don't +# have an entry in the packages file, since they don't live in +# repositories of their own: +# +# - base +# - bin-package-db +# - ghc-prim +# - integer-gmp +# - integer-simple +# - template-haskell define foreachLibrary # $1 = function to call for each library # We will give it the package path and the tag as arguments $$(foreach hashline,libraries/bin-package-db#-#no-remote-repo#no-vcs \ + libraries/base#-#no-remote-repo#no-vcs \ + libraries/ghc-prim#-#no-remote-repo#no-vcs \ + libraries/integer-gmp#-#no-remote-repo#no-vcs \ + libraries/integer-simple#-#no-remote-repo#no-vcs \ + libraries/template-haskell#-#no-remote-repo#no-vcs \ $$(shell grep '^libraries/' packages | sed 's/ */#/g'),\ $$(eval FEL_line := $$(subst #,$$(space),$$(hashline))) \ $$(eval FEL_libdir := $$(word 1,$$(FEL_line))) \ |