X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;fp=rules%2Fbuild-package-data.mk;h=949a7b4b7dc81a1221157f602dfb0f8d59eba562;hb=fcf5e6563cdbaddc0816b5fb65ebc16fd55fcb6b;hp=9c5ffe3c370cd294f34027fb08145037df72a9a9;hpb=f72409f0f893470e7f3a5fbb32b133393d543c01;p=ghc-hetmet.git diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 9c5ffe3..949a7b4 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -45,7 +45,7 @@ $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)" "" 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) - + 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