summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2015-11-02 18:14:08 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2015-11-04 10:32:59 +1100
commit22fcf9c1c8418d2a91fd7b784e7e345c23dff373 (patch)
tree8ac2c021154b253ef66fc7d459ebfdae5166e7ed
parent0e21678677894ed7cb236499ec6f2041efae22a2 (diff)
downloadhaskell-22fcf9c1c8418d2a91fd7b784e7e345c23dff373.tar.gz
Tweak settings for LLVM tests
* The LLVM backend does not currently work on PowerPC so disable it. * Only run LLVM tests if the needed LLVM tools have been detected at configure time. Test Plan: Run LLVM tests on x86_64 and powerpc Reviewers: austin, bgamari, hvr, thomie Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1421
-rw-r--r--testsuite/mk/test.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index e20a522219..013d67f7ec 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -149,11 +149,11 @@ endif
ifeq "$(LLC)" ""
RUNTEST_OPTS += -e ghc_with_llvm=0
+else ifeq "$(TargetARCH_CPP)" "powerpc"
+RUNTEST_OPTS += -e ghc_with_llvm=0
else ifneq "$(LLC)" "llc"
# If we have a real detected value for LLVM, then it really ought to work
RUNTEST_OPTS += -e ghc_with_llvm=1
-else ifneq "$(shell $(SHELL) -c 'llc --version | grep version' 2> /dev/null)" ""
-RUNTEST_OPTS += -e ghc_with_llvm=1
else
RUNTEST_OPTS += -e ghc_with_llvm=0
endif