diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-19 12:55:45 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-20 00:37:01 +0100 |
| commit | 2c2cb608fa5a088022e9e456b5cbc899063e4e1b (patch) | |
| tree | 12080765015b1eab7e6bf2e9768df55801d7c49c /ghc | |
| parent | 17b16ea330efae9733bdf96e30b2759325f9c078 (diff) | |
| download | haskell-2c2cb608fa5a088022e9e456b5cbc899063e4e1b.tar.gz | |
Make the compiler depend on unlit existing
Fixes an unreg build failure. I've also now made these sorts of
dependencies order-only.
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/ghc.mk | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 8776566106..93199d9e68 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -111,21 +111,23 @@ all_ghc_stage3 : $(GHC_STAGE3) $(INPLACE_LIB)/extra-gcc-opts : extra-gcc-opts "$(CP)" $< $@ -# The GHC programs need to depend on all the helper programs they might call +# The GHC programs need to depend on all the helper programs they might call, +# and the settings files they use + +$(GHC_STAGE1) : | $(UNLIT) $(INPLACE_LIB)/extra-gcc-opts +$(GHC_STAGE2) : | $(UNLIT) $(INPLACE_LIB)/extra-gcc-opts +$(GHC_STAGE3) : | $(UNLIT) $(INPLACE_LIB)/extra-gcc-opts + ifeq "$(GhcUnregisterised)" "NO" -$(GHC_STAGE1) : $(SPLIT) -$(GHC_STAGE2) : $(SPLIT) -$(GHC_STAGE3) : $(SPLIT) +$(GHC_STAGE1) : | $(SPLIT) +$(GHC_STAGE2) : | $(SPLIT) +$(GHC_STAGE3) : | $(SPLIT) endif -$(GHC_STAGE1) : $(INPLACE_LIB)/extra-gcc-opts -$(GHC_STAGE2) : $(INPLACE_LIB)/extra-gcc-opts -$(GHC_STAGE3) : $(INPLACE_LIB)/extra-gcc-opts - ifeq "$(Windows)" "YES" -$(GHC_STAGE1) : $(TOUCHY) -$(GHC_STAGE2) : $(TOUCHY) -$(GHC_STAGE3) : $(TOUCHY) +$(GHC_STAGE1) : | $(TOUCHY) +$(GHC_STAGE2) : | $(TOUCHY) +$(GHC_STAGE3) : | $(TOUCHY) endif ifeq "$(BootingFromHc)" "YES" |