diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-06-14 10:11:52 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-06-17 10:05:17 +0100 |
| commit | cd0a0a30c61fb4450953af27fb28b1aa145c1e40 (patch) | |
| tree | 6a73007caca95b6efd64da85319e6b5347f0985e | |
| parent | 1f6c5870fb507e845a9ce86c07b9010ff9fbf67f (diff) | |
| download | haskell-cd0a0a30c61fb4450953af27fb28b1aa145c1e40.tar.gz | |
hadrian: Don't install `include/` directory in bindist.
The install_includes for the RTS package used to be put in the top-level
./include folder but this would lead to confusing things happening if
you installed multiple GHC versions side-by-side.
We don't need this folder anymore because install-includes
is honoured properly by cabal and the relevant header files already
copied in by the cabal installation process.
If you want to depend on the header files for the RTS in a Haskell
project then you just have to depend on the `rts` package and the
correct include directories will be provided for you.
If you want to depend on the header files in a standard C project then
you should query ghc-pkg to get the right paths.
```
ghc-pkg field rts include-dirs --simple-output
```
Fixes #21609
(cherry picked from commit aa7e1f209ddf3dba66b3b212bf2089986c10023e)
| -rw-r--r-- | hadrian/bindist/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index a2591878fb..f828175c04 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -94,7 +94,7 @@ else install_bin: install_bin_libdir install_wrappers endif -install: install_bin install_lib install_includes +install: install_bin install_lib install: install_docs update_package_db ActualBinsDir=${ghclibdir}/bin @@ -188,14 +188,6 @@ install_lib: lib/settings cp -R $$i "$(DESTDIR)$(ActualLibsDir)/"; \ done -INCLUDES = $(wildcard ./include/*) -install_includes: - @echo "Copying include files to $(DESTDIR)$(includedir)" - $(INSTALL_DIR) "$(DESTDIR)$(includedir)" - for i in $(INCLUDES); do \ - cp -R $$i "$(DESTDIR)$(includedir)/"; \ - done - DOCS = $(wildcard ./docs/*) install_docs: @echo "Copying docs to $(DESTDIR)$(docdir)" |