|
12 | 12 | # See the License for the specific language governing permissions and |
13 | 13 | # limitations under the License. |
14 | 14 |
|
15 | | -FROM fedora:37 |
| 15 | +FROM fedora:38 |
16 | 16 | ARG NCPU=4 |
17 | 17 | ARG ARCH=amd64 |
18 | 18 |
|
@@ -40,20 +40,23 @@ RUN echo 'root:' | chpasswd |
40 | 40 | WORKDIR /var/tmp/build |
41 | 41 |
|
42 | 42 | # 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 |
45 | 47 | WORKDIR /var/tmp/build/llvm-project |
46 | 48 | # configure cmake |
47 | | -RUN cmake -GNinja -S llvm -B build \ |
| 49 | +RUN cmake -GNinja -S runtimes -B build \ |
48 | 50 | -DCMAKE_BUILD_TYPE=Release \ |
49 | | - -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi;libunwind" \ |
| 51 | + -DLLVM_ENABLE_PROJECTS="clang" \ |
| 52 | + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ |
50 | 53 | -DCMAKE_C_COMPILER=clang \ |
51 | 54 | -DCMAKE_CXX_COMPILER=clang++ \ |
52 | 55 | -DLLVM_USE_SANITIZER=MemoryWithOrigins \ |
53 | 56 | -DCMAKE_INSTALL_PREFIX=/usr |
54 | 57 | # 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 |
57 | 60 | # The Fedora package for LLVM does something similar: |
58 | 61 | # https://src.fedoraproject.org/rpms/llvm/blob/rawhide/f/llvm.spec#_374 |
59 | 62 | RUN echo "/usr/lib/x86_64-unknown-linux-gnu" >/etc/ld.so.conf.d/msan.conf |
|
0 commit comments