Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/03a016b75d9a52167aaaa09a5d60c7c207613e1e >--------------------------------------------------------------- commit 03a016b75d9a52167aaaa09a5d60c7c207613e1e Author: Simon Marlow <marlo...@gmail.com> Date: Tue Oct 30 11:36:20 2012 +0000 fix HAVE_VANILLA when we have both static profiling and vanilla libs >--------------------------------------------------------------- mk/test.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mk/test.mk b/mk/test.mk index 3784d8f..586cb8b 100644 --- a/mk/test.mk +++ b/mk/test.mk @@ -46,7 +46,7 @@ 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_VANILLA := $(shell if [ -f $(subst \,/,$(HASKELL98_LIBDIR))/libHShaskell98-*[0-9].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) ifeq "$(HAVE_VANILLA)" "YES" _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
