From bc49cbd35e1b9a75ef05de610f845de7bbfef90d Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 9 Aug 2006 14:48:45 +0000 Subject: [PATCH] Where we use $(GhcHcOpts), also add $(GhcStage1HcOpts) This fixes building the compiler with -prof in $(GhcStage1HcOpts) --- compat/Makefile | 2 +- utils/ghc-pkg/Makefile | 2 +- utils/hsc2hs/Makefile | 2 +- utils/runghc/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compat/Makefile b/compat/Makefile index b4e18c9..fe7aa79 100644 --- a/compat/Makefile +++ b/compat/Makefile @@ -41,7 +41,7 @@ UseGhcForCc = YES # In this particular case, it turned out that -DDEBUG made Cabal # import HUnit, which might not be installed for the compiler we are # compiling with (e.g. 6.2.1). Hence the filter-out. -SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts)) +SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts) $(GhcStage1HcOpts)) # GHC 6.4 didn't have WCsubst.c, but 6.4.1 did, and we need to know # this in cbits/unicode.c The patchlevel isn't normally exposed as a diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index 0e4d06f..9ad63cb 100644 --- a/utils/ghc-pkg/Makefile +++ b/utils/ghc-pkg/Makefile @@ -15,7 +15,7 @@ include $(GHC_COMPAT_DIR)/compat.mk # This is required because libghccompat.a must be built with # $(GhcHcOpts) because it is linked to the compiler, and hence # we must also build with $(GhcHcOpts) here: -SRC_HC_OPTS += $(GhcHcOpts) +SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) ifeq "$(ghc_ge_504)" "NO" SRC_HC_OPTS += -package lang -package util -package text diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile index 0216983..7c34bba 100644 --- a/utils/hsc2hs/Makefile +++ b/utils/hsc2hs/Makefile @@ -13,7 +13,7 @@ include $(GHC_COMPAT_DIR)/compat.mk # This is required because libghccompat.a must be built with # $(GhcHcOpts) because it is linked to the compiler, and hence # we must also build with $(GhcHcOpts) here: -SRC_HC_OPTS += $(GhcHcOpts) +SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) HS_PROG = hsc2hs-bin ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile index 90e4949..c1a94c7 100644 --- a/utils/runghc/Makefile +++ b/utils/runghc/Makefile @@ -13,7 +13,7 @@ include $(GHC_COMPAT_DIR)/compat.mk # This is required because libghccompat.a must be built with # $(GhcHcOpts) because it is linked to the compiler, and hence # we must also build with $(GhcHcOpts) here: -SRC_HC_OPTS += $(GhcHcOpts) +SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) all :: runhaskell -- 1.7.10.4