diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-12 15:15:04 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-12 15:15:04 +0100 |
| commit | 962fd59eb0118df0d3b3b4e7c2504b639a25ae15 (patch) | |
| tree | b2a8948257976fca5c5618c2c2f7c01e765d4279 /testsuite/mk | |
| parent | ebd5165970232def6611608a4a958efe595c40fb (diff) | |
| download | haskell-962fd59eb0118df0d3b3b4e7c2504b639a25ae15.tar.gz | |
Change how we detect what library ways are available
We used to use the base package to do the detection. However, base has
extra-lib-dirs: @ICONV_LIB_DIRS@
in base.buildinfo.in, which means that if ICONV_LIB_DIRS is set then
the package config will have
library-dirs: [...]base/dist-install/build /path/for/iconv
and, as paths may be double quoted and contains spaces, this makes it
a little tricky to extra the path that we want to look in (the first
path).
We therefore now use the ghc-prim package, which has no such complication.
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index b43195eebe..fa2edb2439 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -47,10 +47,10 @@ else RUNTEST_OPTS += -e ghc_with_native_codegen=0 endif -BASE_LIBDIR := $(shell "$(GHC_PKG)" field base library-dirs --simple-output) -HAVE_VANILLA := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.hi ]; then echo YES; else echo NO; fi) -HAVE_DYNAMIC := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.dyn_hi ]; then echo YES; else echo NO; fi) -HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.p_hi ]; then echo YES; else echo NO; fi) +GHC_PRIM_LIBDIR := $(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) ifeq "$(HAVE_VANILLA)" "YES" RUNTEST_OPTS += -e ghc_with_vanilla=1 |