diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-08-10 09:34:46 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-08-10 09:34:46 +0000 |
| commit | 7a50ff1e44710335e935ff199cd95616840b9f02 (patch) | |
| tree | 0bf7d1f5b62d976143dfb83545b89338930f5e6e /compiler/Makefile | |
| parent | 401140734891ca804c336122581743251d61b3a6 (diff) | |
| download | haskell-7a50ff1e44710335e935ff199cd95616840b9f02.tar.gz | |
Do the dependency-omitting for 'make 1' in a slightly different way
I encountered a couple of things that broke after Ian's previous
patch: one was my nightly build scripts that use 'make stage=2' at the
top level, and the other is 'make fast' in libraries/base, which uses
'stage=0' to avoid building any compilers.
So my version of this patch is more direct: it just turns off the
appropriate dependencies using a variable set by 'make 1', 'make 2',
etc.
Diffstat (limited to 'compiler/Makefile')
| -rw-r--r-- | compiler/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index f2c31e8067..639076a0bb 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -28,13 +28,13 @@ FAST_MAKE_OPTS += compiler_stage1_NO_BUILD_DEPS=YES compiler_stage2_NO_BUILD_DEP .PHONY: 1 2 3 1: - +$(TOPMAKE) stage=1 all_ghc_stage1 $(FAST_MAKE_OPTS) + +$(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) + +$(TOPMAKE) stage=2 all_ghc_stage2 $(FAST_MAKE_OPTS) NO_STAGE2_DEPS=YES 3: - +$(TOPMAKE) stage=3 all_ghc_stage3 $(FAST_MAKE_OPTS) + +$(TOPMAKE) stage=3 all_ghc_stage3 $(FAST_MAKE_OPTS) NO_STAGE3_DEPS=YES .PHONY: extra-help help : extra-help |