diff options
| author | fanquake <fanquake@gmail.com> | 2023-06-07 13:29:23 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-06-07 13:29:36 +0100 |
| commit | 6cba698a595bf1ff73885a139387b9091dbee23e (patch) | |
| tree | 022bfca83864abb3d816e0983dce6587a2df4830 | |
| parent | 1af72e728d984d9fd49f7fa7eaa0c14943245c19 (diff) | |
| parent | 2ebeb421dd21a69344a32c681ccbfcf5e5c6dab9 (diff) | |
Merge bitcoin/bitcoin#27824: ci: enable AArch64 target in MSAN jobs
2ebeb421dd21a69344a32c681ccbfcf5e5c6dab9 ci: enable AArch64 target in MSAN jobs (fanquake)
c93bfc54e8c4995ecb5af800e2c8df825f310f0d 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 2ebeb421dd21a69344a32c681ccbfcf5e5c6dab9
Tree-SHA512: 9c2e9800f24258fd0f4be5e337178ff473158b2e8f1c431c825465b4f3bd27802422d540d0e7a3b84878c5936f8c302a2fd1c428f41fcd992e12bcc3685698e3
| -rwxr-xr-x | ci/test/01_base_install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 43a76c3d56..230288bc6c 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -42,11 +42,11 @@ if [ -n "$PIP_PACKAGES" ]; then fi if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then - git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.4 "${BASE_SCRATCH_DIR}"/msan/llvm-project + git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.5 "${BASE_SCRATCH_DIR}"/msan/llvm-project cmake -G Ninja -B "${BASE_SCRATCH_DIR}"/msan/clang_build/ -DLLVM_ENABLE_PROJECTS="clang" \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_TARGETS_TO_BUILD=X86 \ + -DLLVM_TARGETS_TO_BUILD=Native \ -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \ -S "${BASE_SCRATCH_DIR}"/msan/llvm-project/llvm @@ -61,7 +61,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then -DLLVM_USE_SANITIZER=MemoryWithOrigins \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DLLVM_TARGETS_TO_BUILD=X86 \ + -DLLVM_TARGETS_TO_BUILD=Native \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ -DLIBCXX_ENABLE_DEBUG_MODE=ON \ -DLIBCXX_ENABLE_ASSERTIONS=ON \ |