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

diff --git a/compiler/Makefile b/compiler/Makefile
index 568812a..793cf6b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -843,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