Fix ghci in stage3

diff --git a/ghc.mk b/ghc.mk
index 160b227..53b859d 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -1,3 +1,4 @@
+
 # -----------------------------------------------------------------------------
 #
 # (c) 2009 The University of Glasgow

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index e6383e1..cd2a027 100644 (file)
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -20,6 +20,7 @@ ghc_stage3_CONFIGURE_OPTS += --flags=stage3
 
 ifeq "$(GhcWithInterpreter)" "YES"
 ghc_stage2_CONFIGURE_OPTS += --flags=ghci
+ghc_stage3_CONFIGURE_OPTS += --flags=ghci
 endif
 
 ghc_stage1_MORE_HC_OPTS = $(GhcStage1HcOpts)
@@ -34,11 +35,6 @@ ghc_stage1_C_FILES_NODEPS = ghc/hschooks.c
 ghc_stage2_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 ghc_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 
-ifeq "$(GhcWithInterpreter)" "YES"
-ghc_stage2_MORE_HC_OPTS += -DGHCI
-ghc_stage3_MORE_HC_OPTS += -DGHCI
-endif
-
 ifeq "$(GhcDebugged)" "YES"
 ghc_stage1_MORE_HC_OPTS += -debug
 ghc_stage2_MORE_HC_OPTS += -debug