diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-27 00:17:39 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-27 00:17:39 +0000 |
| commit | c1e824a275339da8fae6614f5a0db751874d0a36 (patch) | |
| tree | d0ef3aa81de615dc808dd1cf2bf2450269a0798b /ghc | |
| parent | ff3bfae6010625b7ffe96bc62e8e139870684600 (diff) | |
| download | haskell-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 'ghc')
| -rw-r--r-- | ghc/Makefile | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/ghc/Makefile b/ghc/Makefile index 46301a4e50..62207dc563 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -11,49 +11,6 @@ # ----------------------------------------------------------------------------- dir = ghc -TOP = .. -SPEC_TARGETS = 1 2 3 -include $(TOP)/mk/sub-makefile.mk -FAST_MAKE_OPTS += compiler_stage1_NO_BUILD_DEPS=YES \ - compiler_stage2_NO_BUILD_DEPS=YES \ - compiler_stage3_NO_BUILD_DEPS=YES \ - ghc_stage1_NO_BUILD_DEPS=YES \ - ghc_stage2_NO_BUILD_DEPS=YES \ - ghc_stage3_NO_BUILD_DEPS=YES +include ../mk/compiler-ghc.mk -.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 - - -# 'make re2' rebuilds stage2, removing the old executable first. Useful for -# something like 'make re2 GhcDebugged=YES'. - -.PHONY: re1 re2 re3 -re1: - $(RM) stage1/build/tmp/ghc-stage1 - $(MAKE) 1 -re2: - $(RM) stage2/build/tmp/ghc-stage2 - $(MAKE) 2 -re3: - $(RM) stage3/build/tmp/ghc-stage3 - $(MAKE) 3 - -.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." |