Skip to content

Commit 6cba698

Browse files
committed
Merge bitcoin/bitcoin#27824: ci: enable AArch64 target in MSAN jobs
2ebeb42 ci: enable AArch64 target in MSAN jobs (fanquake) c93bfc5 ci: use LLVM 16.0.5 in MSAN jobs (fanquake) Pull request description: Make it possible to run the MSAN jobs on aarch64, as it was previously. ACKs for top commit: dergoegge: utACK 2ebeb42 Tree-SHA512: 9c2e9800f24258fd0f4be5e337178ff473158b2e8f1c431c825465b4f3bd27802422d540d0e7a3b84878c5936f8c302a2fd1c428f41fcd992e12bcc3685698e3
2 parents 1af72e7 + 2ebeb42 commit 6cba698

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci/test/01_base_install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ if [ -n "$PIP_PACKAGES" ]; then
4242
fi
4343

4444
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
45-
git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.4 "${BASE_SCRATCH_DIR}"/msan/llvm-project
45+
git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.5 "${BASE_SCRATCH_DIR}"/msan/llvm-project
4646

4747
cmake -G Ninja -B "${BASE_SCRATCH_DIR}"/msan/clang_build/ -DLLVM_ENABLE_PROJECTS="clang" \
4848
-DCMAKE_BUILD_TYPE=Release \
49-
-DLLVM_TARGETS_TO_BUILD=X86 \
49+
-DLLVM_TARGETS_TO_BUILD=Native \
5050
-DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \
5151
-S "${BASE_SCRATCH_DIR}"/msan/llvm-project/llvm
5252

@@ -61,7 +61,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
6161
-DLLVM_USE_SANITIZER=MemoryWithOrigins \
6262
-DCMAKE_C_COMPILER=clang \
6363
-DCMAKE_CXX_COMPILER=clang++ \
64-
-DLLVM_TARGETS_TO_BUILD=X86 \
64+
-DLLVM_TARGETS_TO_BUILD=Native \
6565
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
6666
-DLIBCXX_ENABLE_DEBUG_MODE=ON \
6767
-DLIBCXX_ENABLE_ASSERTIONS=ON \

0 commit comments

Comments
 (0)