diff options
| author | David Terei <davidterei@gmail.com> | 2012-01-17 00:30:33 -0800 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2012-01-17 00:30:33 -0800 |
| commit | fee30b7de6ab9b54e75c0847e1119baa93c7bf07 (patch) | |
| tree | 150b318cc28d3edc10a833597a9815af474271a0 /testsuite/mk | |
| parent | 08413e4dbd12a69bc36094e73de74293962d1971 (diff) | |
| download | haskell-fee30b7de6ab9b54e75c0847e1119baa93c7bf07.tar.gz | |
Revert "The LLVM backend now only works with 2.9+, don't try it if we have 2.7"
This reverts commit 0114212f8588211d3dd6735d55127bce2cc1dad7.
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index dc49681ce1..23c349544d 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -86,17 +86,11 @@ else RUNTEST_OPTS += -e ghc_with_smp=0 endif -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" +ifneq "$(shell $(SHELL) -c 'llvmc --version | grep version' 2> /dev/null)" "" 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 |