diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-24 01:01:25 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-29 16:57:48 -0400 |
| commit | 7b67724bd1e6237f843241506d9650ea6f27cee2 (patch) | |
| tree | ad4a4c296c7780a0a7d269b65e3ba6461d9e7f8a /ghc.mk | |
| parent | 925c47b46529d202190f18bd653a6945caa51823 (diff) | |
| download | haskell-7b67724bd1e6237f843241506d9650ea6f27cee2.tar.gz | |
make build system: RTS should use dist-install not dist
This is the following find and replace:
- `rts/dist` -> `rts/dist-install` # for paths
- `rts_dist` -> `rts_dist-install` # for make rules and vars
- `,dist` -> `,dist-install` # for make, just in rts/ghc.mk`
Why do this? Does it matter when the RTS is just built once? The answer
is, yes, I think it does, because I want the distdir--stage
correspondence to be consistent.
In particular, for #17191 and continuing from
d5de970dafd5876ef30601697576167f56b9c132 I am going to make the headers
(`rts/includes`) increasingly the responsibility of the RTS (hence their
new location). However, those headers are current made for multiple
stages. This will probably become unnecessary as work on #17191
progresses and the compiler proper becomes more of a freestanding cabal
package (e.g. a library that can be downloaded from Hackage and built
without any autoconf). However, until that is finished, we have will
transitional period where the RTS and headers need to agree on dirs for
multiple stages.
I know the make build system is going away, but it's not going yet, so I
need to change it to unblock things :).
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -572,7 +572,7 @@ utils/check-exact/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/count-deps/dist-install/package-data.mk: compiler/stage2/package-data.mk # add the final package.conf dependency: ghc-prim depends on RTS -libraries/ghc-prim/dist-install/package-data.mk : rts/dist/package.conf.inplace +libraries/ghc-prim/dist-install/package-data.mk : rts/dist-install/package.conf.inplace endif # -------------------------------- @@ -982,7 +982,7 @@ INSTALL_DISTDIR_compiler = stage2 # Now we can do the installation install_packages: install_libexecs -install_packages: rts/dist/package.conf.install +install_packages: rts/dist-install/package.conf.install $(INSTALL_DIR) "$(DESTDIR)$(topdir)" $(call removeTrees,"$(INSTALLED_PACKAGE_CONF)") $(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)" @@ -998,7 +998,7 @@ install_packages: rts/dist/package.conf.install '$(ghclibdir)' \ '$(docdir)/html/libraries' \ '$(GhcLibWays)')) - "$(INSTALLED_GHC_PKG_REAL)" --force --global-package-db "$(INSTALLED_PACKAGE_CONF)" update rts/dist/package.conf.install + "$(INSTALLED_GHC_PKG_REAL)" --force --global-package-db "$(INSTALLED_PACKAGE_CONF)" update rts/dist-install/package.conf.install $(foreach p, $(INSTALL_PACKAGES), \ $(call make-command, \ "$(ghc-cabal_INPLACE)" register \ |