From 2e9fee4031b2203927d2483ab7e212557d9af99b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 21 Jan 2011 23:02:45 +0000 Subject: [PATCH] Remove some hardcoded makefile settings Now that we used cabal to configure the ghc-bin package they are no longer needed. --- ghc/ghc-bin.cabal.in | 2 ++ ghc/ghc.mk | 19 ------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index a0915b3..6481180 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -35,6 +35,8 @@ Executable ghc else Build-Depends: unix + C-Sources: hschooks.c + GHC-Options: -Wall if flag(ghci) CPP-Options: -DGHCI diff --git a/ghc/ghc.mk b/ghc/ghc.mk index a9b6005..d0c5ce8 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -52,29 +52,10 @@ ifeq "$(GhcProfiled)" "YES" ghc_stage2_MORE_HC_OPTS += -prof endif -ghc_stage1_MODULES = Main - -ghc_stage2_MODULES = $(ghc_stage1_MODULES) -ifeq "$(GhcWithInterpreter)" "YES" -ghc_stage2_MODULES += GhciMonad GhciTags InteractiveUI -endif -ghc_stage3_MODULES = $(ghc_stage2_MODULES) - -ghc_stage1_C_SRCS = hschooks.c -ghc_stage2_C_SRCS = hschooks.c -ghc_stage3_C_SRCS = hschooks.c - ghc_stage1_PROG = ghc-stage1$(exeext) ghc_stage2_PROG = ghc-stage2$(exeext) ghc_stage3_PROG = ghc-stage3$(exeext) -# ToDo: perhaps use ghc-cabal to configure ghc-bin -ghc_stage1_MORE_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage1_VERSION) -ghc_stage2_MORE_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage2_VERSION) -ghc_stage3_MORE_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage3_VERSION) -ghc_stage2_MORE_HC_OPTS += -package haskeline -ghc_stage3_MORE_HC_OPTS += -package haskeline - ghc_stage1_SHELL_WRAPPER = YES ghc_stage2_SHELL_WRAPPER = YES ghc_stage3_SHELL_WRAPPER = YES -- 1.7.10.4