diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2014-05-23 22:27:58 +0200 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2014-05-23 23:38:59 +0200 |
| commit | 864759cbf7061849ce93123ebb15a3bb6ae06111 (patch) | |
| tree | 82db3cd1bd323d00aec44e9e11dbe622567009cb | |
| parent | b33f321a57fd75c89c2daffb4d207fee1fb26fee (diff) | |
| download | haskell-864759cbf7061849ce93123ebb15a3bb6ae06111.tar.gz | |
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.
| -rw-r--r-- | testsuite/mk/test.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 0cc3f21c8a..d6e550fb9d 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) |