Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Clang CI #124

Merged
merged 2 commits into from
Apr 6, 2023
Merged

Fix Clang CI #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ad403
llvm >= 16 don't support libcxx/libcxxabi in LLVM_ENABLE_PROJECTS but
wx257osn2 Apr 6, 2023
cadbb56
fix for readability
wx257osn2 Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion ga-build/clang/run.sh
View file
Open in desktop
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=""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これらの初期値は <16 としても >=16 としても間違ってる値だし、LLVM_ENABLE_RUNTIMES だけ -DLLVM_ENABLE_RUNTIMES= が付いてるのも分かりにくいので、

LLVM_ENABLE_PROJECTS="-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;libcxx;libcxxabi"
LLVM_ENABLE_RUNTIMES=""

とした上で、>=16 だった場合に両方を書き換えたほうが分かりやすいです。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

対応しました

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