Enable the optllvm way if llvmc is found
authorSimon Marlow <marlowsd@gmail.com>
Mon, 23 Aug 2010 10:18:51 +0000 (10:18 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Mon, 23 Aug 2010 10:18:51 +0000 (10:18 +0000)
testsuite/config/ghc
testsuite/mk/test.mk

index 83e05ca..c14d95e 100644 (file)
@@ -57,6 +57,9 @@ if (ghc_with_dynamic_rts == 1):
 if (ghc_with_profiling == 1 and ghc_with_threaded_rts == 1):
         config.run_ways.append('profthreaded')
 
+if (ghc_with_llvm == 1):
+        config.run_ways.append('optllvm')
+
 config.in_tree_compiler = in_tree_compiler
 
 config.way_flags = {
index 892af91..8dae2bf 100644 (file)
@@ -86,6 +86,12 @@ else
 RUNTEST_OPTS += -e ghc_with_smp=0
 endif
 
+ifneq "$(shell llvmc --version | grep version)" ""
+RUNTEST_OPTS += -e ghc_with_llvm=1
+else
+RUNTEST_OPTS += -e ghc_with_llvm=0
+endif
+
 ifeq "$(WINDOWS)" "YES"
 RUNTEST_OPTS += -e windows=True
 else