summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-10-24 01:15:14 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-10-31 09:04:41 -0400
commite4095c0c85b9c9f70f3c3d665370916e8fd4f616 (patch)
tree5b0cc24bf03924f80d982b3b6ab2b4cba9fcaab9 /.gitignore
parentea862ef5b3779476e0aa2d20bbae1946d07430f1 (diff)
downloadhaskell-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 '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f66faf033e..c860ecd9cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,9 +80,8 @@ _darcs/
/libraries/*/dist-install/
/libraries/*/dist-newstyle/
/libraries/dist-haddock/
-/rts/dist-install/
-/rts/include/dist/
-/rts/include/dist-*/
+/rts/dist/
+/rts/dist-*/
/utils/*/dist*/
/compiler/stage1/
/compiler/stage2/
@@ -188,7 +187,6 @@ _darcs/
/mk/project.mk
/mk/project.mk.old
/mk/validate.mk
-/rts/include/dist/
/rts/rts.cabal
/rts/package.conf.inplace
/rts/package.conf.inplace.raw