[commit: ghc] wip/angerman/backport/8.6/reinstallable-lib-ghc: Make it build (19a6f31)

[git at git.haskell.org]

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/19a6f315a227b69725db360667075a9247517bb6/ghc

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

commit 19a6f315a227b69725db360667075a9247517bb6
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Mar 6 15:24:08 2019 +0800

    Make it build


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

19a6f315a227b69725db360667075a9247517bb6
 ghc/ghc.mk                           | 6 ++++++
 libraries/ghc-prim/ghc.mk            | 2 +-
 {compiler => rts/build}/HsVersions.h | 0
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 8099fe2..05354fb 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -178,6 +178,12 @@ INSTALL_LIBS += settings
 INSTALL_LIBS += llvm-targets
 INSTALL_LIBS += llvm-passes
 
+# A rather nasty hack needed because we still have headers in
+# ghc-prim and rts.
+ghc_stage1_HC_OPTS += -Irts/build -Ilibraries/ghc-prim/dist-boot
+ghc_stage2_HC_OPTS += -Irts/build -Ilibraries/ghc-prim/dist-install
+ghc_stage3_HC_OPTS += -Irts/build -Ilibraries/ghc-prim/dist-install
+
 ifeq "$(Windows_Host)" "NO"
 install: install_ghc_link
 .PHONY: install_ghc_link
diff --git a/libraries/ghc-prim/ghc.mk b/libraries/ghc-prim/ghc.mk
index f865c0f..87f676f 100644
--- a/libraries/ghc-prim/ghc.mk
+++ b/libraries/ghc-prim/ghc.mk
@@ -13,7 +13,7 @@ define libraries/ghc-prim_PACKAGE_MAGIC
 libraries/ghc-prim_dist-install_MODULES := $$(filter-out GHC.Prim,$$(libraries/ghc-prim_dist-install_MODULES))
 endef
 
-PRIMOPS_TXT_STAGE1 = libraries/ghc-prim/dist-boot/build/primops.txt
+PRIMOPS_TXT_STAGE1 = libraries/ghc-prim/dist-boot/primops.txt
 
 libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $$(genprimopcode_INPLACE) $(PRIMOPS_TXT_STAGE1) | $$(dir $$@)/.
 	"$(genprimopcode_INPLACE)" --make-haskell-wrappers < $(PRIMOPS_TXT_STAGE1) >$@
diff --git a/compiler/HsVersions.h b/rts/build/HsVersions.h
similarity index 100%
rename from compiler/HsVersions.h
rename to rts/build/HsVersions.h