From 845995719b97d8b94e943ad38eeb77ad8d404223 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 11 Jul 2008 21:43:58 +0000 Subject: [PATCH] Handle passing hsc2hs to Cabal better If it has been built then we pass it, even if we are still using the bootstrapping compiler. --- mk/cabal-flags.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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) \ -- 1.7.10.4