projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle EXTRA_LIBRARIES when building programs
[ghc-hetmet.git]
/
rules
/
extra-packages.mk
diff --git
a/rules/extra-packages.mk
b/rules/extra-packages.mk
index
c54c604
..
271bc6d
100644
(file)
--- a/
rules/extra-packages.mk
+++ b/
rules/extra-packages.mk
@@
-36,11
+36,9
@@
$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ ]\+ \+\(dp
endef
define extra-package # $1 = package root, $2 = package
endef
define extra-package # $1 = package root, $2 = package
+$(call trace, extra-package($1,$2))
+
EXTRA_PACKAGES += $2
EXTRA_PACKAGES += $2
-ifeq "$(wildcard libraries/$1/ghc-stage2-package)" ""
$$(eval $$(call addPackage,$2))
$$(eval $$(call addPackage,$2))
-else
-$$(eval $$(call addPackage2,$2))
-endif
-endef
+endef