X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=9c8da7dc899115463ef3892afad22e14d89a3805;hb=5d7e13eab7070d6858f6b8ff572baed572967fe2;hp=568812acd4430c94904fcf8edc95d82ade2ddcfc;hpb=54a322297a6e73ad22df21a8e597b591b6da23fa;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 568812a..9c8da7d 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -271,7 +271,6 @@ endif
 	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
 	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
 	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
-	@echo "cDocDir               = \"$(docdir)\""         >> $(CONFIG_HS)
 ifeq "$(RelocatableBuild)" "YES"
 	@echo "cRelocatableBuild     = True"                  >> $(CONFIG_HS)
 else
@@ -843,7 +842,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