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.

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

build/image: Update llvm -> 18.1.8 #379

Merged
merged 3 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/linux/common_fun.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install_libcxx () {
cmake -GNinja \
-B "${LIBCXX_PATH}" \
-S "runtimes" \
-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx" \
-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx;libunwind" \
-DLLVM_USE_LINKER=lld \
-DLLVM_USE_SANITIZER="${LLVM_USE_SANITIZER}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
Expand Down
8 changes: 4 additions & 4 deletions docker/linux/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-
BAZELISK_SHA256SUM=ce52caa51ef9e509fb6b7e5ad892e5cf10feb0794b0aed4d2f36adb00a1a2779 \
BAZELISK_SHA256SUM_ARM64=6070bf70915e92b3a5ce8eee6f4a8a0968bb350be2a98b80b0fd2fc13ce8a254 \
BAZELISK_VERSION=1.18.0 \
CLANG_TOOLS_SHA256SUM=430fadf6b4b287686e7043792e4defc4b54a4911d02bda540aa5acf63a0de5fa \
CLANG_TOOLS_SHA256SUM=e58877fcd95ed106824bd1a31276dd17ed0c53adcd60ca75289eac0654f0a7f1 \
DEBIAN_FRONTEND=noninteractive \
LANG=en_US.utf8 \
LCOV_VERSION=1.15 \
Expand All @@ -17,9 +17,9 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-
LLVM_DISTRO=x86_64-linux-gnu-ubuntu-18.04 \
LLVM_DISTRO_ARM64=aarch64-linux-gnu \
LLVM_DOWNLOAD_PREFIX=https://github.com/llvm/llvm-project/releases/download/llvmorg- \
LLVM_SHA256SUM=2b8a69798e8dddeb57a186ecac217a35ea45607cb2b3cf30014431cff4340ad1 \
LLVM_SHA256SUM_ARM64=b750ba3120e6153fc5b316092f19b52cf3eb64e19e5f44bd1b962cb54a20cf0a \
LLVM_VERSION=16.0.0 \
LLVM_SHA256SUM=54ec30358afcc9fb8aa74307db3046f5187f9fb89fb37064cdde906e062ebf36 \
LLVM_SHA256SUM_ARM64=dcaa1bebbfbb86953fdfbdc7f938800229f75ad26c5c9375ef242edad737d999 \
LLVM_VERSION=18.1.8 \
ZULU_INSTALL_DEB=https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
ENV LANG=$LANG
SHELL ["/bin/bash", "-ec"]
Expand Down
4 changes: 2 additions & 2 deletions docker/windows/docker_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ AddToPath C:\tools\ninja

# LLVM to ensure a 64-bit build of the tool (VS BuildTools ships a 32-bit build)
DownloadAndCheck $env:TEMP\LLVM-win64.exe `
https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/LLVM-16.0.0-win64.exe `
e41295133d6d24cc8133702768ddb4e3bffd9f9b4a9b2faf9cd0a045cfc90abc
https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/LLVM-18.1.8-win64.exe `
94af030060d88cc17e9f00ef1663ebdc1126b35e16bebdfa1e807984b70abd8f
RunAndCheckError $env:TEMP\LLVM-win64.exe @("/S") $true
AddToPath $env:ProgramFiles\LLVM\bin

Expand Down