[commit: testsuite] master: Fix detection of library flavors on FreeBSD (cd01ce2)

Páli Gábor János pali.gabor at gmail.com
Sun Apr 21 19:38:39 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

https://github.com/ghc/testsuite/commit/cd01ce2f3db387054623ab743c5bb8910d5271ea

>---------------------------------------------------------------

commit cd01ce2f3db387054623ab743c5bb8910d5271ea
Author: Gabor Pali <pali.gabor at gmail.com>
Date:   Sun Apr 21 19:19:26 2013 +0200

    Fix detection of library flavors on FreeBSD

>---------------------------------------------------------------

 mk/test.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/test.mk b/mk/test.mk
index 3ba6f74..5c9e1ad 100644
--- a/mk/test.mk
+++ b/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 | sed 's/^[^:]*: *//')
-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





More information about the ghc-commits mailing list