diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-09-18 10:48:03 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-14 12:03:57 -0400 |
| commit | 89f4d8e950a1ed2a3ffab424233d3bcd243b1771 (patch) | |
| tree | b11f62f73d26947b0f9b7c3868ba66f9ee9cef7a | |
| parent | 0fc1cb54d1afc0f002deb4d080c9b824f423b647 (diff) | |
| download | haskell-89f4d8e950a1ed2a3ffab424233d3bcd243b1771.tar.gz | |
Bump LLVM version to 10.0
Fixes #18267.
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38e984a7c3..b6e31bf75a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -838,6 +838,9 @@ validate-x86_64-linux-fedora27: stage: full-build image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV" variables: + # LLVM 10 is not available for Fedora27 + LLC: /bin/false + OPT: /bin/false TEST_ENV: "x86_64-linux-fedora27" BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-fedora27-linux.tar.xz" cache: diff --git a/configure.ac b/configure.ac index 168cd24afd..3d0bbac7ed 100644 --- a/configure.ac +++ b/configure.ac @@ -715,7 +715,7 @@ AC_SUBST(InstallNameToolCmd) # tools we are looking for. In the past, GHC supported a number of # versions of LLVM simultaneously, but that stopped working around # 3.5/3.6 release of LLVM. -LlvmVersion=9 +LlvmVersion=10 AC_SUBST([LlvmVersion]) sUPPORTED_LLVM_VERSION=$(echo \($LlvmVersion\) | sed 's/\./,/') AC_DEFINE_UNQUOTED([sUPPORTED_LLVM_VERSION], ${sUPPORTED_LLVM_VERSION}, [The supported LLVM version number]) |