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 /compiler/codeGen | |
| 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 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgProf.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/CgTicky.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmProf.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmTicky.hs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs index 3e247ff4d6..cac33eef90 100644 --- a/compiler/codeGen/CgProf.hs +++ b/compiler/codeGen/CgProf.hs @@ -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 diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs index 04f38ac8c4..0ff440e6bf 100644 --- a/compiler/codeGen/CgTicky.hs +++ b/compiler/codeGen/CgTicky.hs @@ -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 diff --git a/compiler/codeGen/StgCmmProf.hs b/compiler/codeGen/StgCmmProf.hs index d9b3583382..115ef1f45e 100644 --- a/compiler/codeGen/StgCmmProf.hs +++ b/compiler/codeGen/StgCmmProf.hs @@ -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 diff --git a/compiler/codeGen/StgCmmTicky.hs b/compiler/codeGen/StgCmmTicky.hs index 8b8ab34989..a6c592cfd8 100644 --- a/compiler/codeGen/StgCmmTicky.hs +++ b/compiler/codeGen/StgCmmTicky.hs @@ -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 |