diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2008-09-17 08:59:17 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2008-09-17 08:59:17 +0000 |
| commit | 8e39f6aaf6b194efcdef989a90498b22f09cf424 (patch) | |
| tree | 9a37a9c01578eaa0329b383d0d587e6e4edd0a30 /ghc/Makefile | |
| parent | c7ae8f20f93b4e36837fc3ecafccd3f49c95cb6b (diff) | |
| download | haskell-8e39f6aaf6b194efcdef989a90498b22f09cf424.tar.gz | |
Fix: GhcStage2HcOpts were being added to stage 3 too
Diffstat (limited to 'ghc/Makefile')
| -rw-r--r-- | ghc/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ghc/Makefile b/ghc/Makefile index 0c0f3ec54c..048b3a59b7 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -47,27 +47,28 @@ clean.stage.%: CONFIGURE_FLAGS_STAGE1 += --flags=-ghci ifeq "$(GhcWithInterpreter)" "YES" -CONFIGURE_FLAGS_STAGE2 += --flags=ghci +CONFIGURE_FLAGS_STAGE2PLUS += --flags=ghci else -CONFIGURE_FLAGS_STAGE2 += --flags=-ghci +CONFIGURE_FLAGS_STAGE2PLUS += --flags=-ghci endif ifeq "$(GhcProfiled)" "YES" -CONFIGURE_FLAGS_STAGE2 += --enable-executable-profiling +CONFIGURE_FLAGS_STAGE2PLUS += --enable-executable-profiling endif ifeq "$(GhcDebugged)" "YES" -CONFIGURE_FLAGS_STAGE2 += --ghc-option=-debug +CONFIGURE_FLAGS_STAGE2PLUS += --ghc-option=-debug endif ifeq "$(GhcThreaded)" "YES" # Use threaded RTS with GHCi, so threads don't get blocked at the prompt. -CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded +CONFIGURE_FLAGS_STAGE2PLUS += --ghc-option=-threaded endif ifeq "$(BuildSharedLibs)" "YES" -CONFIGURE_FLAGS_STAGE2 += --ghc-option=-dynamic +CONFIGURE_FLAGS_STAGE2PLUS += --ghc-option=-dynamic endif -CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2) +CONFIGURE_FLAGS_STAGE2 = $(CONFIGURE_FLAGS_STAGE2PLUS) +CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2PLUS) CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS) |