diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-12-02 21:35:18 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-12-02 21:38:04 +0000 |
| commit | e8723129a6c48438e81f95a73271014ffa96eaa3 (patch) | |
| tree | c82faa1a063be27fdd827deeda1d4f5e41418a3c /includes/ghc.mk | |
| parent | 2694bb74158bac7276cded2435bba8e889659f98 (diff) | |
| download | haskell-e8723129a6c48438e81f95a73271014ffa96eaa3.tar.gz | |
Move includes/DerivedConstants.h and includes/GHCConstants.h into dist dirs
When they existed, they were getting included in the includes_H_FILES
variable (as it uses wildcard to find all header files). But the
.depends files for the programs that generate the headers depend on
$(includes_H_FILES), so the .depends files looked out-of-date once the
headers had been created. This caused unnecessary make reinvocations.
So now we put them in dist* directories, where they ought to be anyway.
Diffstat (limited to 'includes/ghc.mk')
| -rw-r--r-- | includes/ghc.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 7c2aac52cf..0ef2f54906 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -41,7 +41,10 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" includes_CC_OPTS += -DTABLES_NEXT_TO_CODE endif -includes_CC_OPTS += -Iincludes -Irts +includes_CC_OPTS += -Iincludes +includes_CC_OPTS += -Iincludes/dist-derivedconstants/header +includes_CC_OPTS += -Iincludes/dist-ghcconstants/header +includes_CC_OPTS += -Irts ifneq "$(GhcWithSMP)" "YES" includes_CC_OPTS += -DNOSMP @@ -126,7 +129,7 @@ endif # --------------------------------------------------------------------------- # Make DerivedConstants.h for the compiler -includes_DERIVEDCONSTANTS = includes/DerivedConstants.h +includes_DERIVEDCONSTANTS = includes/dist-derivedconstants/header/DerivedConstants.h ifeq "$(PORTING_HOST)" "YES" @@ -145,7 +148,7 @@ $(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(include includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM) ifneq "$(BINDIST)" "YES" -$(includes_DERIVEDCONSTANTS) : $(INPLACE_BIN)/mkDerivedConstants$(exeext) +$(includes_DERIVEDCONSTANTS) : $(INPLACE_BIN)/mkDerivedConstants$(exeext) | $$(dir $$@)/. ./$< >$@ endif @@ -154,7 +157,7 @@ endif # ----------------------------------------------------------------------------- # -includes_GHCCONSTANTS = includes/GHCConstants.h +includes_GHCCONSTANTS = includes/dist-ghcconstants/header/GHCConstants.h ifeq "$(PORTING_HOST)" "YES" @@ -175,7 +178,7 @@ $(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_ includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM) -$(includes_GHCCONSTANTS) : $(INPLACE_BIN)/mkGHCConstants$(exeext) +$(includes_GHCCONSTANTS) : $(INPLACE_BIN)/mkGHCConstants$(exeext) | $$(dir $$@)/. ./$< >$@ endif |