[Git][ghc/ghc][wip/js-staging] stopgap fix for missing ghc-pkg in cross-compiler tests

[Josh Meredith (@JoshMeredith)]

Josh Meredith pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
67f65dae by Josh Meredith at 2022-08-31T14:31:03+00:00
stopgap fix for missing ghc-pkg in cross-compiler tests

- - - - -


1 changed file:

- testsuite/mk/boilerplate.mk


Changes:

=====================================
testsuite/mk/boilerplate.mk
=====================================
@@ -150,7 +150,17 @@ BIN_ROOT = $(shell dirname '$(TEST_HC)')
 ifeq "$(IMPLICIT_COMPILER)" "YES"
 find_tool = $(shell which $(1))
 else
-find_tool = $(BIN_ROOT)/$(1)
+find_tool = $(BIN_ROOT)/$(PLATFORM_PREFIX)$(1)
+endif
+
+ifeq "$(IMPLICIT_COMPILER)" "YES"
+find_other_tool = $(shell which $(1))
+else
+	ifeq "$(TOOL_ROOT)" ""
+    find_other_tool = $(BIN_ROOT)/$(PLATFORM_PREFIX)$(1)
+  else
+  	find_other_tool = $(TOOL_ROOT)/$(PLATFORM_PREFIX)$(1)
+  endif
 endif
 
 ifeq "$(GHC_PKG)" ""
@@ -158,11 +168,11 @@ GHC_PKG := $(call find_tool,ghc-pkg)
 endif
 
 ifeq "$(RUNGHC)" ""
-RUNGHC := $(call find_tool,runghc)
+RUNGHC := $(call find_other_tool,runghc)
 endif
 
 ifeq "$(HADDOCK)" ""
-HADDOCK := $(call find_tool,haddock)
+HADDOCK := $(call find_other_tool,haddock)
 endif
 
 ifeq "$(HSC2HS)" ""
@@ -174,7 +184,7 @@ HP2PS_ABS := $(call find_tool,hp2ps)
 endif
 
 ifeq "$(HPC)" ""
-HPC := $(call find_tool,hpc)
+HPC := $(call find_other_tool,hpc)
 endif
 
 $(eval $(call canonicaliseExecutable,TEST_HC))



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/67f65daedfb649538dd133e85a898a27c07d33b4

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/67f65daedfb649538dd133e85a898a27c07d33b4
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220831/0222d2b6/attachment-0001.html>