diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-06-14 21:37:05 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-06-15 13:22:51 -0400 |
| commit | e6498d67768eb4657b766f226a8b1ebad6e00a4f (patch) | |
| tree | d43f40fb861e3f10604ed6c13d183575e565c3a1 | |
| parent | b7deeed00d93c306e55572c9c1c09ced4be61eef (diff) | |
| download | haskell-e6498d67768eb4657b766f226a8b1ebad6e00a4f.tar.gz | |
Bump supported LLVM version to 6.0
This seems to fix a number of segmentation faults.
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 49f145d2c8..2caa3b468a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -189,8 +189,8 @@ jobs: - run: name: Install LLVM command: | - curl http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-x86_64-linux-gnu-debian8.tar.xz | tar -xJC .. - echo "export PATH=`pwd`/../clang+llvm-5.0.0-x86_64-linux-gnu-debian8/bin:\$PATH" >> $BASH_ENV + curl http://releases.llvm.org/6.0.0/clang+llvm-6.0.0-x86_64-linux-gnu-debian8.tar.xz | tar -xJC .. + echo "export PATH=`pwd`/../clang+llvm-6.0.0-x86_64-linux-gnu-debian8/bin:\$PATH" >> $BASH_ENV - run: name: Verify that llc works command: llc diff --git a/configure.ac b/configure.ac index 21f9f1694d..2e6e64481c 100644 --- a/configure.ac +++ b/configure.ac @@ -643,7 +643,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=5.0 +LlvmVersion=6.0 AC_SUBST([LlvmVersion]) sUPPORTED_LLVM_VERSION=$(echo \($LlvmVersion\) | sed 's/\./,/') AC_DEFINE_UNQUOTED([sUPPORTED_LLVM_VERSION], ${sUPPORTED_LLVM_VERSION}, [The supported LLVM version number]) |