diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-10 10:53:52 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-11-15 10:45:55 -0500 |
| commit | 8c5cb80698da2608f08738822d97cdcb682c5544 (patch) | |
| tree | 6000ffdb40a57075408aa08dbc0225c70f4adcae | |
| parent | 46afc380b1445d6bcff0c954569a59420c847534 (diff) | |
| download | haskell-8c5cb80698da2608f08738822d97cdcb682c5544.tar.gz | |
Bump supported LLVM version to 9.0
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a0c98a3a0..8099941053 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 69abb3614435999fd0895bc8a231b7494063e20c + DOCKER_REV: 8beb70e553e521796f4250000107c008b477040f # Sequential version number capturing the versions of all tools fetched by # .gitlab/win32-init.sh. diff --git a/configure.ac b/configure.ac index 00fb9a5568..130744f0ba 100644 --- a/configure.ac +++ b/configure.ac @@ -656,7 +656,7 @@ AC_SUBST([LibtoolCmd]) # 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=7 +LlvmVersion=9 AC_SUBST([LlvmVersion]) sUPPORTED_LLVM_VERSION=$(echo \($LlvmVersion\) | sed 's/\./,/') AC_DEFINE_UNQUOTED([sUPPORTED_LLVM_VERSION], ${sUPPORTED_LLVM_VERSION}, [The supported LLVM version number]) |