X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fcabal-flags.mk;h=52624a291c9c4ca32e536a00c82407bbfc4dbc99;hp=cabe3285a861460b9796dd1d9674405608ebecf4;hb=845995719b97d8b94e943ad38eeb77ad8d404223;hpb=e7d5df5d11379fb95ffd980b56a97ee143720d6a diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index cabe328..52624a2 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -35,6 +35,9 @@ endif COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) +COMMON_CONFIGURE_FLAGS += $(shell [ -e $(HSC2HS_INPLACE) ] && \ + echo --with-hsc2hs=$(HSC2HS_INPLACE) ) + ifeq "$(Windows)" "YES" NONEXISTENT=c:/NONEXISTENT else @@ -59,8 +62,7 @@ INPLACE_DIRS_CONFIGURE_FLAGS = \ USE_STAGE1_CONFIGURE_FLAGS = \ --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ - --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ - --with-hsc2hs=$(HSC2HS_INPLACE) + --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace USE_BOOT_CONFIGURE_FLAGS = \ --with-compiler=$(GHC) \