Commit e8723129 authored by Ian Lynagh's avatar Ian Lynagh

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.
parent 2694bb74
......@@ -35,7 +35,7 @@ module CgProf (
#include "../includes/rts/Constants.h"
-- For LDV_CREATE_MASK, LDV_STATE_USE
-- which are StgWords
#include "../includes/DerivedConstants.h"
#include "../includes/dist-derivedconstants/header/DerivedConstants.h"
-- For REP_xxx constants, which are MachReps
import ClosureInfo
......
......@@ -43,7 +43,7 @@ module CgTicky (
staticTickyHdr,
) where
#include "../includes/DerivedConstants.h"
#include "../includes/dist-derivedconstants/header/DerivedConstants.h"
-- For REP_xxx constants, which are MachReps
import ClosureInfo
......
......@@ -36,7 +36,7 @@ module StgCmmProf (
#include "../includes/rts/Constants.h"
-- For LDV_CREATE_MASK, LDV_STATE_USE
-- which are StgWords
#include "../includes/DerivedConstants.h"
#include "../includes/dist-derivedconstants/header/DerivedConstants.h"
-- For REP_xxx constants, which are MachReps
import StgCmmClosure
......
......@@ -46,7 +46,7 @@ module StgCmmTicky (
) where
#include "HsVersions.h"
#include "../includes/DerivedConstants.h"
#include "../includes/dist-derivedconstants/header/DerivedConstants.h"
-- For REP_xxx constants, which are MachReps
import StgCmmClosure
......
......@@ -19,7 +19,7 @@ settings for the target plat instead).
#include "stg/MachRegs.h"
#include "rts/Constants.h"
#include "MachDeps.h"
#include "DerivedConstants.h"
#include "../includes/dist-derivedconstants/header/DerivedConstants.h"
-- import Util
......@@ -196,5 +196,5 @@ bITMAP_BITS_SHIFT = BITMAP_BITS_SHIFT
-- Constants derived from headers in ghc/includes, generated by the program
-- ../includes/mkDerivedConstants.c.
#include "GHCConstants.h"
#include "../includes/dist-ghcconstants/header/GHCConstants.h"
......@@ -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
......
......@@ -51,7 +51,7 @@ extra-libraries:
#ifdef INSTALLING
include-dirs: INCLUDE_DIR PAPI_INCLUDE_DIR
#else /* !INSTALLING */
include-dirs: TOP"/includes"
include-dirs: TOP"/includes" TOP"/includes/dist-ghcconstants/header" TOP"/includes/dist-derivedconstants/header"
#endif
includes: Stg.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment