[commit: testsuite] master: Fix the have-we-got-vanilla-libraries test (90033bb)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master http://hackage.haskell.org/trac/ghc/changeset/90033bb91c19be44bda84f9e2b7099a08850c1b3 >--------------------------------------------------------------- commit 90033bb91c19be44bda84f9e2b7099a08850c1b3 Author: Ian Lynagh <[email protected]> Date: Tue Oct 30 02:39:01 2012 +0000 Fix the have-we-got-vanilla-libraries test It thought that the profiling libraries were vanilla >--------------------------------------------------------------- mk/test.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/test.mk b/mk/test.mk index 3784d8f..8b28944 100644 --- a/mk/test.mk +++ b/mk/test.mk @@ -45,9 +45,9 @@ else RUNTEST_OPTS += -e ghc_with_native_codegen=0 endif -HASKELL98_LIBDIR := $(shell "$(GHC_PKG)" field haskell98 library-dirs | sed 's/^[^:]*: *//') -HAVE_VANILLA := $(shell if [ -f $(subst \,/,$(HASKELL98_LIBDIR))/libHShaskell98-*.a ]; then echo YES; else echo NO; fi) -HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(HASKELL98_LIBDIR))/libHShaskell98-*_p.a ]; then echo YES; else echo NO; fi) +BASE_LIBDIR := $(shell "$(GHC_PKG)" field base library-dirs | sed 's/^[^:]*: *//') +HAVE_VANILLA := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.hi ]; then echo YES; else echo NO; fi) +HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.p_a ]; then echo YES; else echo NO; fi) ifeq "$(HAVE_VANILLA)" "YES" RUNTEST_OPTS += -e ghc_with_vanilla=1