diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-10 14:32:32 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-10 14:32:32 +0100 |
| commit | 985a2212f72becb76c8fe6c500dcf4b68c9b81c6 (patch) | |
| tree | 44b687af9cd099f5a79a9e221540ad305db19e61 /testsuite/mk/test.mk | |
| parent | 8eb3cf9671a7acd7c715265ae8dd639257878178 (diff) | |
| download | haskell-985a2212f72becb76c8fe6c500dcf4b68c9b81c6.tar.gz | |
Fix library way detection; fixes the ImpSafeOnly* tests when BINDIST=YES
We were checking paths with
if [ -f '"/path/to/Prelude"' ]
i.e. the " quotes were being quoted by the ' quotes. Now we just
use " quotes (which come from the ghc-pkg output).
Diffstat (limited to 'testsuite/mk/test.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 ee6dd0abb9..b43195eebe 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -48,9 +48,9 @@ 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) +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) ifeq "$(HAVE_VANILLA)" "YES" RUNTEST_OPTS += -e ghc_with_vanilla=1 |