diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2019-01-20 20:32:07 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2020-07-16 13:47:46 -0400 |
| commit | 69afa45ff3914d3e593b52b845706a1fddd831a8 (patch) | |
| tree | 3e58ae5679fd71b54c0a33bce60f518fad50d935 | |
| parent | c0979cc53442b3a6202acab9cf164f0a4beea0b7 (diff) | |
| download | haskell-wip/D4333.tar.gz | |
testsuite: Don't disable LLVM ways due to unversioned llcwip/D4333
Previously we would silently disable the LLVM testsuite ways when LLC is
set to an unversioned llc executable (e.g. `llc` instead of `llc-5.0`).
Presumably this was because we were lax in checking the LLVM version in
configure. However, this is no longer the case and consequently this
confusing behavior is no longer necessary.
See Trac #16121.
Test Plan: Validate
Reviewers: angerman
Reviewed By: angerman
Subscribers: michalt, rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4333
| -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" |