summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-06-14 10:11:52 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-06-16 12:38:21 -0400
commitaa7e1f209ddf3dba66b3b212bf2089986c10023e (patch)
treeeb9b1040bb2d86b82763da116f2655d492768e6a
parent25b510c3ffdb6f43695c31c0740a5cbe1b7f3898 (diff)
downloadhaskell-aa7e1f209ddf3dba66b3b212bf2089986c10023e.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
-rw-r--r--hadrian/bindist/Makefile10
1 files changed, 1 insertions, 9 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile
index cffeb4f973..63fb7d0551 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
@@ -187,14 +187,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)"