From edb526551c5a4b99d9630b088616e3660a2ec4f0 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 26 Mar 2007 15:59:49 +0000 Subject: [PATCH] move "boot :: all" after the include of target.mk to fix #1095 --- includes/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/includes/Makefile b/includes/Makefile index e653d3e..cfb2a48 100644 --- a/includes/Makefile +++ b/includes/Makefile @@ -163,10 +163,6 @@ CLEAN_FILES += mkGHCConstants$(exeext) GHCConstants.h # --------------------------------------------------------------------------- # boot setup: # -# Need config.h to make dependencies in the runtime system source. -# -boot :: all - # # Install all header files # @@ -188,3 +184,14 @@ CLEAN_FILES += $(H_CONFIG) $(H_PLATFORM) # Finally, slurp in the standard targets. # include $(TOP)/mk/target.mk + +# We need DerivedConstants.h in order to make dependencies in the RTS +# sources, so 'make boot' here should behave like 'make all'. +# +# However, note that we should do this only *after* 'make boot' has +# created .depend in here; otherwise an out-of-date .depend file can +# prevent 'make boot' from working, requiring manual removal of +# .depend (see #1095). This is why the following target comes *after* +# target.mk is included above (target.mk contains "boot :: depend"). +# +boot :: all -- 1.7.10.4