Skip to content

Commit

Permalink
Merge pull request #124 from wx257osn2/fix-clang-16-and-later
Browse files Browse the repository at this point in the history
Fix Clang CI
  • Loading branch information
melpon committed Apr 6, 2023
2 parents b4c0b51 + cadbb56 commit a4b4f84
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion ga-build/clang/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,18 @@ if compare_version "$VERSION" ">=" "14.0.0"; then
pushd build
export CC=clang
export CXX=clang++
LLVM_ENABLE_PROJECTS='-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libcxx;libcxxabi"'
LLVM_ENABLE_RUNTIMES=""
if compare_version "$VERSION" ">=" "16.0.0"; then
# llvm-project 16.0.0 以降はlibcxx, libcxxabi, libunwind, compiler-rtなどは
# LLVM_ENABLE_PROJECTSではなくLLVM_ENABLE_RUNTIMESで指定しなければならない
# cf. https://github.com/llvm/llvm-project/commit/258477ed0ab69d334302225322ac81ac974b59fb
LLVM_ENABLE_PROJECTS='-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"'
LLVM_ENABLE_RUNTIMES='-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"'
fi
cmake \
"-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;libcxx;libcxxabi" \
${LLVM_ENABLE_PROJECTS} \
${LLVM_ENABLE_RUNTIMES} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
../llvm
Expand Down

0 comments on commit a4b4f84

Please sign in to comment.