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 /mk | |
| 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 'mk')
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | mk/tree.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 35f6e2d087..95c9fe9378 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -154,7 +154,7 @@ endif GhcUnregisterised=@Unregisterised@ # ArchSupportsSMP should be set iff there is support for that arch in -# includes/stg/SMP.h +# rts/include/stg/SMP.h ifeq "$(TargetArch_CPP)" "arm" # We don't support load/store barriers pre-ARMv7. See #10433. ArchSupportsSMP=$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES) diff --git a/mk/tree.mk b/mk/tree.mk index 5a61a4a4aa..fa3d99a18c 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 = includes includes/dist includes/dist-derivedconstants/header includes/dist-ghcconstants/header +GHC_INCLUDE_DIRS = rts/include rts/include/dist rts/include/dist-derivedconstants/header rts/include/dist-ghcconstants/header GHC_RTS_DIR = rts GHC_DRIVER_DIR = driver |