X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=78998f1b72c837d7a4b1dca07839ec96fb56584c;hb=5882c5ff503c5b3b425708621cbc3371cc36e5de;hp=a74e096e4a5d60933a2affe57b482786db414da4;hpb=75cd9c50ea68a5e426e3105735713b8015d63413;p=ghc-hetmet.git

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index a74e096..78998f1 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -69,26 +69,8 @@ $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.
 	"$$(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
 ifeq "$$($1_$2_PROG)" ""
 ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO"
-ifeq "$$(ghc_ge_6102) $3" "NO 0" # 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
-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