diff options
| -rw-r--r-- | testsuite/mk/ghc-config.hs | 4 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index b0278bcfae..141a0df347 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -27,8 +27,8 @@ main = do getGhcFieldOrDefault fields "GhcDynamic" "GHC Dynamic" "NO" getGhcFieldOrDefault fields "GhcProfiled" "GHC Profiled" "NO" getGhcFieldProgWithDefault fields "AR" "ar command" "ar" - getGhcFieldProgWithDefault fields "CLANG" "LLVM clang command" "clang" - getGhcFieldProgWithDefault fields "LLC" "LLVM llc command" "llc" + getGhcFieldProgWithDefault fields "CLANG" "LLVM clang command" "" + getGhcFieldProgWithDefault fields "LLC" "LLVM llc command" "" getGhcFieldProgWithDefault fields "TEST_CC" "C compiler command" "gcc" let pkgdb_flag = case lookup "Project version" fields of diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index b2cdf78f5f..75d0ba6c62 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -193,11 +193,9 @@ ifeq "$(LLC)" "" RUNTEST_OPTS += -e ghc_with_llvm=False else ifeq "$(TargetARCH_CPP)" "powerpc" RUNTEST_OPTS += -e ghc_with_llvm=False -else ifneq "$(LLC)" "llc" +else # If we have a real detected value for LLVM, then it really ought to work RUNTEST_OPTS += -e ghc_with_llvm=True -else -RUNTEST_OPTS += -e ghc_with_llvm=False endif ifeq "$(WINDOWS)" "YES" |