[commit: ghc] master: test.mk: Be liberal in accepting GHC_PKG output (864759c)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/864759cbf7061849ce93123ebb15a3bb6ae06111/ghc

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

commit 864759cbf7061849ce93123ebb15a3bb6ae06111
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri May 23 22:27:58 2014 +0200

    test.mk: Be liberal in accepting GHC_PKG output
    
    When the tree is not built, GHC_PKG refers to ghc-pkg in the patth,
    which may not yet support --simple-output to suppress the field name. So
    we strip the fieldname when parsing the output, to avoid annoying
    warnings.


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

864759cbf7061849ce93123ebb15a3bb6ae06111
 testsuite/mk/test.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 0cc3f21..d6e550f 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -55,7 +55,7 @@ else
 RUNTEST_OPTS += -e ghc_with_native_codegen=0
 endif
 
-GHC_PRIM_LIBDIR := $(shell "$(GHC_PKG)" field ghc-prim library-dirs --simple-output)
+GHC_PRIM_LIBDIR := $(subst library-dirs: ,,$(shell "$(GHC_PKG)" field ghc-prim library-dirs --simple-output))
 HAVE_VANILLA := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.hi ]; then echo YES; else echo NO; fi)
 HAVE_DYNAMIC := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.dyn_hi ]; then echo YES; else echo NO; fi)
 HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.p_hi ]; then echo YES; else echo NO; fi)