[commit: ghc] master: Bump supported LLVM version to 6.0 (e6498d6)

git at git.haskell.org git at git.haskell.org
Fri Jun 15 17:23:15 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e6498d67768eb4657b766f226a8b1ebad6e00a4f/ghc

>---------------------------------------------------------------

commit e6498d67768eb4657b766f226a8b1ebad6e00a4f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Jun 14 21:37:05 2018 -0400

    Bump supported LLVM version to 6.0
    
    This seems to fix a number of segmentation faults.


>---------------------------------------------------------------

e6498d67768eb4657b766f226a8b1ebad6e00a4f
 .circleci/config.yml | 4 ++--
 configure.ac         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49f145d..2caa3b4 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 21f9f16..2e6e644 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])



More information about the ghc-commits mailing list