X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FMakefile;h=793cf6b007a26f99f434fb025dc745e11732b07d;hb=7c737416e30137e7053b4bcd0fdd563f07fa43b0;hp=de9c9791ed1bf8ed6dc473ec1fcca0e5e4376a65;hpb=07570cc95f56295d962cf0f30d3231bd21fce8a1;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index de9c979..793cf6b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -493,10 +493,7 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif
 else
--include $(FPTOOLS_TOP_ABS)/libraries/readline/config.mk
-# readline's config.mk sets PACKAGE, which we don't want here
-PACKAGE=
-ifeq "$(READLINE_BUILD_PACKAGE)" "yes"
+ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/readline/unbuildable)" ""
 SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif
@@ -846,7 +843,9 @@ PACKAGE = ghc
 HIERARCHICAL_LIB = NO
 VERSION = $(ProjectVersion)
 PKG_DEPENDS += base haskell98
-PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
+# We have to expand each package dependency with its version, which we
+# can do by calling "ghc-pkg list $pkg --simple-output".
+PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))'
 PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"'
 
 # Omit Main from the library, the client will want to plug their own Main in