diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-11-28 10:20:00 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-11-28 10:20:21 +0100 |
| commit | c239d3dac9ced786b41410e54243a50b7a9dc304 (patch) | |
| tree | eaa127ddcd88504eb3edd54acf5f948cd498f450 /ci | |
| parent | 19baf0178befcb4fe5569d659a7d82f7ea2fe154 (diff) | |
| parent | 54dd8f51ce8815a93a6aceb36dd72bd449d6b327 (diff) | |
| download | bitcoin-c239d3dac9ced786b41410e54243a50b7a9dc304.tar.xz | |
Merge bitcoin/bitcoin#26574: ci: use ci_exec_root for clang install
54dd8f51ce8815a93a6aceb36dd72bd449d6b327 ci: use ci_exec_root for clang install (josibake)
Pull request description:
fixes a bug introduced in #25900 ; see https://github.com/bitcoin/bitcoin/pull/25900#issuecomment-1327311069
the general idea of #25900 was to use a non-root user as much as possible to avoid modifying the user's local filesystem. however, it appears the root user is needed to correctly install clang.
ACKs for top commit:
hebasto:
ACK 54dd8f51ce8815a93a6aceb36dd72bd449d6b327, tested on Ubuntu 22.04.
Tree-SHA512: beb01d4b6127fbba3c8d18e85cf7ec7d1b2ec93ea05c475ab51bcaa04ef1b0591d886f1a7e0732c5ae86806013f022c0b44027380d2b0cfb1bfdc843e40f99b4
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/04_install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index c25abb99ee..4915797ca4 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -130,8 +130,8 @@ fi CI_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/" if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then - CI_EXEC "update-alternatives --install /usr/bin/clang++ clang++ \$(which clang++-12) 100" - CI_EXEC "update-alternatives --install /usr/bin/clang clang \$(which clang-12) 100" + CI_EXEC_ROOT "update-alternatives --install /usr/bin/clang++ clang++ \$(which clang++-12) 100" + CI_EXEC_ROOT "update-alternatives --install /usr/bin/clang clang \$(which clang-12) 100" CI_EXEC "mkdir -p ${BASE_SCRATCH_DIR}/msan/build/" CI_EXEC "git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-12.0.0 ${BASE_SCRATCH_DIR}/msan/llvm-project" CI_EXEC "cd ${BASE_SCRATCH_DIR}/msan/build/ && cmake -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi' -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_SANITIZER=MemoryWithOrigins -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_TARGETS_TO_BUILD=X86 ../llvm-project/llvm/" |