From e5bc09bc47d6d922501b51e9da8f84ef6a7ccbea Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 20 May 2009 13:00:09 +0000 Subject: [PATCH] Use SRC_HC_OPTS when making ghc-cabal and ghc-pkg --- utils/ghc-cabal/ghc.mk | 2 +- utils/ghc-pkg/ghc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index b73d413..4ddf294 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -25,7 +25,7 @@ $(GHC_CABAL_INPLACE) : $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext) $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/ghc-cabal.hs $(MKDIRHIER) $(MKDIRHIER) bootstrapping $(MKDIRHIER) $(dir $@) - $(GHC) --make $(GHC_CABAL_DIR)/ghc-cabal.hs -o $@ \ + $(GHC) $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/ghc-cabal.hs -o $@ \ -Wall $(WERROR) \ -DCABAL_VERSION=$(CABAL_VERSION) \ -odir bootstrapping \ diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index ff1b6e0..1afd962 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -49,7 +49,7 @@ endif utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs $(GHC_CABAL_INPLACE) $(MKDIRHIER) $(MKDIRHIER) bootstrapping $(MKDIRHIER) utils/ghc-pkg/dist/build - $(GHC) --make utils/ghc-pkg/Main.hs -o $@ \ + $(GHC) $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \ -Wall \ -DCABAL_VERSION=$(CABAL_VERSION) \ -odir bootstrapping \ -- 1.7.10.4