diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-30 02:39:01 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-30 02:39:01 +0000 |
| commit | 7d7410f531ac2c6a0da23412494775c827cd4f4f (patch) | |
| tree | f8b30178eda33307231de69ad0d5fea932c95bca /testsuite/mk | |
| parent | 8c3dc562f553da70a7f9a3eed0d737ed51aaefee (diff) | |
| download | haskell-7d7410f531ac2c6a0da23412494775c827cd4f4f.tar.gz | |
Fix the have-we-got-vanilla-libraries test
It thought that the profiling libraries were vanilla
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 3784d8f4ca..8b289441d0 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/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 |