Skip to content

Commit b7dc366

Browse files
authored
ci: move msan build to Fedora:38 (#12750)
1 parent 2139571 commit b7dc366

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

ci/cloudbuild/dockerfiles/fedora-msan.Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM fedora:37
15+
FROM fedora:38
1616
ARG NCPU=4
1717
ARG ARCH=amd64
1818

@@ -40,20 +40,23 @@ RUN echo 'root:' | chpasswd
4040
WORKDIR /var/tmp/build
4141

4242
# Install instructions from:
43-
# https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
44-
RUN git clone --depth=1 --branch llvmorg-15.0.7 https://github.com/llvm/llvm-project
43+
# https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
44+
# with updates from:
45+
# https://github.com/google/sanitizers/issues/1685
46+
RUN git clone --depth=1 --branch llvmorg-16.0.6 https://github.com/llvm/llvm-project
4547
WORKDIR /var/tmp/build/llvm-project
4648
# configure cmake
47-
RUN cmake -GNinja -S llvm -B build \
49+
RUN cmake -GNinja -S runtimes -B build \
4850
-DCMAKE_BUILD_TYPE=Release \
49-
-DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi;libunwind" \
51+
-DLLVM_ENABLE_PROJECTS="clang" \
52+
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
5053
-DCMAKE_C_COMPILER=clang \
5154
-DCMAKE_CXX_COMPILER=clang++ \
5255
-DLLVM_USE_SANITIZER=MemoryWithOrigins \
5356
-DCMAKE_INSTALL_PREFIX=/usr
5457
# build the libraries
55-
RUN cmake --build build -- cxx cxxabi unwind
56-
RUN cmake --build build -- install-cxx install-cxxabi install-unwind
58+
RUN cmake --build build
59+
RUN cmake --install build
5760
# The Fedora package for LLVM does something similar:
5861
# https://src.fedoraproject.org/rpms/llvm/blob/rawhide/f/llvm.spec#_374
5962
RUN echo "/usr/lib/x86_64-unknown-linux-gnu" >/etc/ld.so.conf.d/msan.conf

0 commit comments

Comments
 (0)