diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-04-29 00:58:38 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-04-29 00:58:38 +0000 |
| commit | 46aed8a4a084add708bbd119d19905105d5f0d72 (patch) | |
| tree | 2f93cdcc414bc3a3b128512b0a1ee3d6ddce95bf /ghc/ghc.mk | |
| parent | e213baf0e233efca39d627efcbabeeaac14f3e5c (diff) | |
| download | haskell-46aed8a4a084add708bbd119d19905105d5f0d72.tar.gz | |
Use haskeline, rather than editline, for line editing in ghci
Diffstat (limited to 'ghc/ghc.mk')
| -rw-r--r-- | ghc/ghc.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index ccd4c5d685..3a3edec1ce 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -41,8 +41,8 @@ endif ghc_stage1_MODULES = Main -ghc_stage2_MODULES = $(ghc_stage1_MODULES) -ghc_stage3_MODULES = $(ghc_stage1_MODULES) +ghc_stage2_MODULES = $(ghc_stage1_MODULES) GhciMonad GhciTags InteractiveUI +ghc_stage3_MODULES = $(ghc_stage2_MODULES) ghc_stage1_PROG = ghc-stage1$(exeext) ghc_stage2_PROG = ghc-stage2$(exeext) @@ -53,10 +53,18 @@ ghc_stage1_USE_BOOT_LIBS = YES ghc_stage1_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage1_VERSION) ghc_stage2_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage2_VERSION) ghc_stage3_HC_OPTS += -package $(compiler_PACKAGE)-$(compiler_stage3_VERSION) - -ghc_stage1_HC_OPTS += -XCPP -XPatternGuards -ghc_stage2_HC_OPTS += -XCPP -XPatternGuards -ghc_stage3_HC_OPTS += -XCPP -XPatternGuards +ghc_stage2_HC_OPTS += -package haskeline +ghc_stage3_HC_OPTS += -package haskeline + +ghc_language_extension_flags = -XCPP \ + -XPatternGuards \ + -XForeignFunctionInterface \ + -XUnboxedTuples \ + -XFlexibleInstances \ + -XMagicHash +ghc_stage1_HC_OPTS += $(ghc_language_extension_flags) +ghc_stage2_HC_OPTS += $(ghc_language_extension_flags) +ghc_stage3_HC_OPTS += $(ghc_language_extension_flags) # In stage1 we might not benefit from cross-package dependencies and # recompilation checking. We must force recompilation here, otherwise |