diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-07-22 07:26:47 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-08-09 15:11:58 -0400 |
| commit | d5de970dafd5876ef30601697576167f56b9c132 (patch) | |
| tree | cb2ccf4bc4c13e39e211beb60915d7bb4ccc477d /.gitignore | |
| parent | fc350dba63da7eefbaa2793fe9fe99f8571b75c0 (diff) | |
| download | haskell-d5de970dafd5876ef30601697576167f56b9c132.tar.gz | |
Move `/includes` to `/rts/include`, sort per package better
In order to make the packages in this repo "reinstallable", we need to
associate source code with a specific packages. Having a top level
`/includes` dir that mixes concerns (which packages' includes?) gets in
the way of this.
To start, I have moved everything to `rts/`, which is mostly correct.
There are a few things however that really don't belong in the rts (like
the generated constants haskell type, `CodeGen.Platform.h`). Those
needed to be manually adjusted.
Things of note:
- No symlinking for sake of windows, so we hard-link at configure time.
- `CodeGen.Platform.h` no longer as `.hs` extension (in addition to
being moved to `compiler/`) so as not to confuse anyone, since it is
next to Haskell files.
- Blanket `-Iincludes` is gone in both build systems, include paths now
more strictly respect per-package dependencies.
- `deriveConstants` has been taught to not require a `--target-os` flag
when generating the platform-agnostic Haskell type. Make takes
advantage of this, but Hadrian has yet to.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 6d518555ce..e4c0104b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -75,14 +75,14 @@ _darcs/ /driver/ghc/dist/ /driver/haddock/dist/ /driver/ghci/dist/ -/includes/dist/ -/includes/dist-*/ /libffi/dist-install/ /libraries/*/dist-boot/ /libraries/*/dist-install/ /libraries/*/dist-newstyle/ /libraries/dist-haddock/ /rts/dist/ +/rts/include/dist/ +/rts/include/dist-*/ /utils/*/dist*/ /compiler/stage1/ /compiler/stage2/ @@ -104,6 +104,11 @@ _darcs/ /ch01.html /ch02.html /compiler/dist/ +/compiler/Bytecodes.h +/compiler/ClosureTypes.h +/compiler/FunTypes.h +/compiler/MachDeps.h +/compiler/MachRegs.h /compiler/ghc.cabal /compiler/ghc.cabal.old /distrib/configure.ac @@ -139,7 +144,6 @@ _darcs/ /settings /ghc.spec /ghc/ghc-bin.cabal -/includes/dist/ /index.html /inplace/ /libffi/build/ @@ -184,6 +188,7 @@ _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 |