From 2c2cb608fa5a088022e9e456b5cbc899063e4e1b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 19 Apr 2011 12:55:45 +0100 Subject: [PATCH] Make the compiler depend on unlit existing Fixes an unreg build failure. I've also now made these sorts of dependencies order-only. --- ghc/ghc.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 8776566..93199d9 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" -- 1.7.10.4