summaryrefslogtreecommitdiff
path: root/compiler/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-01-27 00:17:39 +0000
committerIan Lynagh <igloo@earth.li>2011-01-27 00:17:39 +0000
commitc1e824a275339da8fae6614f5a0db751874d0a36 (patch)
treed0ef3aa81de615dc808dd1cf2bf2450269a0798b /compiler/Makefile
parentff3bfae6010625b7ffe96bc62e8e139870684600 (diff)
downloadhaskell-c1e824a275339da8fae6614f5a0db751874d0a36.tar.gz
Fix "make 1" etc following the build system changes
The logic is now in mk/compiler-ghc.mk rather than being duplicated in ghc/Makefile and compiler/Makefile.
Diffstat (limited to 'compiler/Makefile')
-rw-r--r--compiler/Makefile27
1 files changed, 2 insertions, 25 deletions
diff --git a/compiler/Makefile b/compiler/Makefile
index 639076a0bb..f099ab718b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -16,32 +16,9 @@
default_to_ghc : all_ghc
dir = compiler
-TOP = ..
-SPEC_TARGETS = 1 2 3
-include $(TOP)/mk/sub-makefile.mk
+
+include ../mk/compiler-ghc.mk
all_ghc :
+$(TOPMAKE) all_ghc $(EXTRA_MAKE_OPTS)
-FAST_MAKE_OPTS += compiler_stage1_NO_BUILD_DEPS=YES compiler_stage2_NO_BUILD_DEPS=YES compiler_stage3_NO_BUILD_DEPS=YES
-
-.PHONY: 1 2 3
-
-1:
- +$(TOPMAKE) stage=1 all_ghc_stage1 $(FAST_MAKE_OPTS) NO_STAGE1_DEPS=YES NO_STAGE2_DEPS=YES
-
-2:
- +$(TOPMAKE) stage=2 all_ghc_stage2 $(FAST_MAKE_OPTS) NO_STAGE2_DEPS=YES
-
-3:
- +$(TOPMAKE) stage=3 all_ghc_stage3 $(FAST_MAKE_OPTS) NO_STAGE3_DEPS=YES
-
-.PHONY: extra-help
-help : extra-help
-extra-help :
- @echo " make 1"
- @echo " make 2"
- @echo " make 3"
- @echo
- @echo " Build the stage 1, 2 or 3 GHC respectively, omitting dependencies"
- @echo " and initial phases for speed."