[commit: ghc] wip/angerman/backport/8.6/reinstallable-lib-ghc: Make sure headers are copied properly. (4a32ec7)

git at git.haskell.org git at git.haskell.org
Fri Mar 8 01:45:22 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/angerman/backport/8.6/reinstallable-lib-ghc
Link       : http://ghc.haskell.org/trac/ghc/changeset/4a32ec7e3ddda7294a03a65c8f5033ccab023aa6/ghc

>---------------------------------------------------------------

commit 4a32ec7e3ddda7294a03a65c8f5033ccab023aa6
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Mar 6 21:51:47 2019 +0800

    Make sure headers are copied properly.


>---------------------------------------------------------------

4a32ec7e3ddda7294a03a65c8f5033ccab023aa6
 includes/ghc.mk                   | 2 ++
 libraries/ghc-prim/ghc-prim.cabal | 1 +
 2 files changed, 3 insertions(+)

diff --git a/includes/ghc.mk b/includes/ghc.mk
index d08ecfb..0b3fcf0 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -229,4 +229,6 @@ install_includes :
 	    $(INSTALL_HEADER) $(INSTALL_OPTS) includes/$d/*.h "$(DESTDIR)$(ghcheaderdir)/$d/" && \
 	) true
 	$(INSTALL_HEADER) $(INSTALL_OPTS) $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_VERSION) $(includes_DERIVEDCONSTANTS) "$(DESTDIR)$(ghcheaderdir)/"
+	$(INSTALL_HEADER) rts/build/*.h rts/build/*.hs-incl includes/CodeGen.Platform.hs "$(DESTDIR)$(ghcheaderdir)/"
+	$(INSTALL_HEADER $(includes_GHCCONSTANTS_HASKELL_TYPE) $(includes_GHCCONSTANTS_HASKELL_VALUE) $(includes_GHCCONSTANTS_HASKELL_WRAPPERS) $(includes_GHCCONSTANTS_HASKELL_EXPORTS) "$(DESTDIR)$(ghcheaderdir)/"
 
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index 1432360..132fe12 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -99,6 +99,7 @@ Library
         include-dirs: dist-install
 
     install-includes:
+        ghc_boot_platform.h
         primop-data-decl.hs-incl
         primop-tag.hs-incl
         primop-list.hs-incl



More information about the ghc-commits mailing list