X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=4640b7f9ac3d238f00d22d74237232f8cbf10175;hp=b070777035fcda33d1e067d7e1bd146c6925d171;hb=757d3c5aa87ff18c0cd8a27870ffc5d7836338ed;hpb=7eb456b97c5a9911981afa172acf9ef50b75f9fa

diff --git a/ghc.mk b/ghc.mk
index b070777..4640b7f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -43,7 +43,7 @@
 #     then we don't have to use -osuf/-hisuf.  We would have to install
 #     them in different places too, so we'd need ghc-pkg support for packages
 #     of different ways.
-#   * make PACKAGES generated by configure or sh boot?
+#   * make PACKAGES generated by './configure' or 'perl boot'?
 #   * we should use a directory of package.conf files rather than a single
 #     file for the inplace package database, so that we can express
 #     dependencies more accurately.  Otherwise it's possible to get into
@@ -356,6 +356,8 @@ endif
 # so we don't have to include it below.
 BOOT_PKGS = Cabal hpc extensible-exceptions binary bin-package-db
 
+BOOT_PKG_CONSTRAINTS := $(foreach p,$(BOOT_PKGS),--constraint "$p == $(shell grep -i "^Version:" libraries/$p/$p.cabal | sed "s/[^0-9.]//g")")
+
 # The actual .a and .so/.dll files: needed for dependencies.
 ALL_STAGE1_LIBS  = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB))
 ifeq "$(BuildSharedLibs)" "YES"