Fix build with GHC <= 6.10.1

diff --git a/configure.ac b/configure.ac
index 5ba6707..c615967 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,10 @@ if test "$WithGhc" != ""; then
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
+  FP_COMPARE_VERSIONS($GhcVersion,[-ge],[6.10.2],
+                      [ghc_ge_6102=YES], [ghc_ge_6102=NO])
   AC_SUBST(ghc_ge_609)dnl
+  AC_SUBST(ghc_ge_6102)dnl
 fi
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a120e46..6516238 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -508,6 +508,7 @@ GhcMajVersion       = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 
 ghc_ge_609 = @ghc_ge_609@
+ghc_ge_6102 = @ghc_ge_6102@
 
 # Canonicalised ghc version number, used for easy (integer) version
 # comparisons.  We must expand $(GhcMinVersion) to two digits by

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 47bed79..9c5ffe3 100644 (file)
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -43,8 +43,26 @@ endif
 # the build tree.
 $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP)
        "$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" --with-gcc="$$(WhatGccIsCalled)" --configure-option=--with-cc="$$(WhatGccIsCalled)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
-       if [ "$$($1_$2_PROG)" = "" ]; then \
-           "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config; \
-       fi
+ifeq "$$($1_$2_PROG)" ""
+ifeq "$$(ghc_ge_6102) $$($1_$2_USE_BOOT_LIBS)" "NO YES" # NOTE [1] below
+           cat $1/$2/inplace-pkg-config | sed "s|^import-dirs:|import-dirs: $(TOP)/$1 $(TOP)/$1/src |" | "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) -
+else
+           "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
+endif
+endif
+
+# [1] this is a hack for GHC <= 6.10.1.  When making dependencies with
+# ghc -M, in GHC 6.10.1 and earlier, GHC needed to find either the .hi
+# file or the source file for any dependency.  Since we build the
+# .depend files before building the packages, we have to make sure GHC
+# can find the source files; hence we have to make sure that the
+# import-dirs field of each boot package points to the sources for the
+# package as well as the dist/build dir.
+#
+# In GHC 6.10.2, we changed the way ghc -M worked so that it doesn't
+# check for existence of the source file, and doesn't look for the .hi
+# file if there is only one possibility for its location.  Which means
+# that we must *not* do that above hack in this case, because there
+# would be multiple locations to search for the .hi file.
 
 endef