X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;fp=rules%2Fbuild-package-data.mk;h=4fe60f9818878f55fce2f798d3eedfe7b77ac974;hb=354503a27a016b2cc030b7fae5d007b0259c77d2;hp=81913dcc879b804c0611af0b9cd899b5f64fb199;hpb=d210b148c72c7fa97e87214d38608ef011657271;p=ghc-hetmet.git diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 81913dc..4fe60f9 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -48,12 +48,14 @@ endif $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 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