From 76f3725f79299f9e00e9040b4b83b1db116e273d Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 17 May 2021 10:14:27 -0400 Subject: [PATCH] Build with LLVM 12 (#515) * Build with LLVM 12 * Update scripts * Fix syntax --- .github/workflows/ci.yml | 6 ++++-- scripts/build.sh | 4 ++++ scripts/docker-lifter-entrypoint.sh | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9461ecd33..a0d8d82d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,8 @@ jobs: llvm: [ '9', '10', - '11' + '11', + '12' ] runs-on: ubuntu-20.04 @@ -100,7 +101,8 @@ jobs: 'macos-10.15' ] llvm: [ - '11' + '11', + '12' ] runs-on: ${{ matrix.os }} diff --git a/scripts/build.sh b/scripts/build.sh index 5583e182a..7c472615f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -305,6 +305,10 @@ function GetLLVMVersion LLVM_VERSION=llvm-11 return 0 ;; + 12) + LLVM_VERSION=llvm-12 + return 0 + ;; *) # unknown option echo "[x] Unknown LLVM version ${1}. You may be able to manually build it with cxx-common." diff --git a/scripts/docker-lifter-entrypoint.sh b/scripts/docker-lifter-entrypoint.sh index 28cf2ec21..ba6f75c85 100755 --- a/scripts/docker-lifter-entrypoint.sh +++ b/scripts/docker-lifter-entrypoint.sh @@ -43,6 +43,9 @@ case ${LLVM_VERSION} in llvm11*) V=11 ;; + llvm12*) + V=12 + ;; *) echo "Unknown LLVM version: ${LLVM_VERSION}" exit 1