summaryrefslogtreecommitdiff
path: root/testsuite/mk
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-01-16 12:40:51 +0000
committerSimon Marlow <marlowsd@gmail.com>2012-01-16 13:31:20 +0000
commita8f94ccfb99d357229be6cc25129e56d7abf853a (patch)
tree8fd551a7dcc8183a0c83bf13693e7e14549e6337 /testsuite/mk
parent199f38884fd4128979283086fbb77dc0631f0567 (diff)
downloadhaskell-a8f94ccfb99d357229be6cc25129e56d7abf853a.tar.gz
The LLVM backend now only works with 2.9+, don't try it if we have 2.7
This fix is very wrong, but I'm drowning in optllvm failures and need to fix this ASAP (it's somewhat suboptimal that I won't be able to run the LLVM tests here until I upgrade the OS or install a later LLVM manually).
Diffstat (limited to 'testsuite/mk')
-rw-r--r--testsuite/mk/test.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 23c349544d..dc49681ce1 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -86,11 +86,17 @@ else
RUNTEST_OPTS += -e ghc_with_smp=0
endif
-ifneq "$(shell $(SHELL) -c 'llvmc --version | grep version' 2> /dev/null)" ""
+LLVM_VERSION = $(shell $(SHELL) -c "llvmc --version | grep version | sed 's/^.*version \([0-9]*\)\.\([0-9]*\).*$$/\1\.\2/'" 2> /dev/null)
+
+ifneq "$(LLVM_VERSION)" ""
+ifneq "$(LLVM_VERSION)" "2.7"
RUNTEST_OPTS += -e ghc_with_llvm=1
else
RUNTEST_OPTS += -e ghc_with_llvm=0
endif
+else
+RUNTEST_OPTS += -e ghc_with_llvm=0
+endif
ifeq "$(WINDOWS)" "YES"
RUNTEST_OPTS += -e windows=True