diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-24 01:15:14 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-31 09:04:41 -0400 |
| commit | e4095c0c85b9c9f70f3c3d665370916e8fd4f616 (patch) | |
| tree | 5b0cc24bf03924f80d982b3b6ab2b4cba9fcaab9 /mk | |
| parent | ea862ef5b3779476e0aa2d20bbae1946d07430f1 (diff) | |
| download | haskell-e4095c0c85b9c9f70f3c3d665370916e8fd4f616.tar.gz | |
Make build system: Put make generated include's in RTS distdirs
These are best thought of as being part of the RTS.
- After !6791, `ghcautoconf.h` won't be used by the compiler
inappropriately.
- `ghcversion.h` is only used once outside the RTS, which is
`compiler/cbits/genSym.c`. Except we *do* mean the RTS GHC is built
against there, so it's better if we always get get the installed
version.
- `ghcplatform.h` alone is used extensively outside the RTS, but
since we no longer have a target platform it is perfectly
safe/correct to get the info from the previous RTS.
All 3 are exported from the RTS currently and in the bootstrap window.
This commit just swaps directories around, such that the new headers may
continue to be used in stage 0 despite the reasoning above, but the idea
is that we can subsequently make more interesting changes doubling down
on the reasoning above.
In particular, in !6803 we'll start "morally" moving `ghcautonconf.h`
over, introducing an RTS configure script and temporary header of its
`AC_DEFINE`s until the top-level configure script doesn't define any
more.
Progress towards #17191
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tree.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/tree.mk b/mk/tree.mk index d2613b2a41..216cc8ba2b 100644 --- a/mk/tree.mk +++ b/mk/tree.mk @@ -10,7 +10,7 @@ # indicates a directory relative to the top of the source tree. GHC_UTILS_DIR = utils -GHC_INCLUDE_DIRS = rts/include rts/include/dist rts/include/dist-derivedconstants/header +GHC_INCLUDE_DIRS = rts/include rts/dist-install/build/include GHC_RTS_DIR = rts GHC_DRIVER_DIR = driver |