|
43 | 43 | msvc Optimized-Debug
|
44 | 44 | gcc UBSan Coverage
|
45 | 45 | clang UBSan
|
| 46 | + apple-clang UBSan ASan |
46 | 47 | factors: ''
|
47 | 48 | runs-on: |
|
48 | 49 | apple-clang: macos-15
|
@@ -71,10 +72,11 @@ jobs:
|
71 | 72 | llvm-sanitizer: {{#if ubsan}}-UBSan{{else if asan}}-ASan{{else if msan}}-MSan{{/if}}
|
72 | 73 | llvm-build-preset: {{{ llvm-build-preset-prefix }}}-{{{ llvm-build-preset-os }}}
|
73 | 74 | llvm-compiler-version: {{#if (or (contains version '*') (contains version '^'))}}{{else}}-{{{ version }}}{{/if}}
|
74 |
| - llvm-archive-basename: llvm-{{{ lowercase os }}}-{{{ compiler }}}{{{ llvm-compiler-version }}}-{{{ llvm-build-preset-prefix }}}{{{ sanitizer }}}-{{{ substr llvm-hash 0 7 }}} |
| 75 | + llvm-archive-basename: llvm-{{{ lowercase os }}}-{{{ compiler }}}{{{ llvm-compiler-version }}}-{{{ llvm-build-preset-prefix }}}{{{ llvm-sanitizer }}}-{{{ substr llvm-hash 0 7 }}} |
75 | 76 | llvm-root: ../third-party/llvm-project/install
|
76 | 77 | llvm-archive-extension: {{#if (ieq os 'windows') }}7z{{else}}tar.bz2{{/if}}
|
77 | 78 | llvm-archive-filename: {{{ llvm-archive-basename }}}.{{{ llvm-archive-extension }}}
|
| 79 | + llvm-sanizizer-config: {{#if (or (ne compiler 'clang') (ne compiler 'apple-clang'))}}{{else if ubsan}}Undefined{{else if asan}}Address{{/if}} |
78 | 80 | mrdocs-ccflags: {{{ ccflags }}} {{#if (and (eq compiler 'gcc') (not asan)) }}-static{{/if}}
|
79 | 81 | mrdocs-cxxflags: {{{ cxxflags }}} {{#if (and (eq compiler 'gcc') (not asan)) }}-static{{/if}}
|
80 | 82 | mrdocs-package-generators: {{#if (ieq os 'windows') }}7Z ZIP WIX{{else}}TGZ TXZ{{/if}}
|
@@ -261,10 +263,7 @@ jobs:
|
261 | 263 | build-type: ${{ matrix.build-type }}
|
262 | 264 | extra-args: |
|
263 | 265 | ${{ runner.os == 'Windows' && '-DLLVM_ENABLE_RUNTIMES=libcxx' || '-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi;libunwind' }}
|
264 |
| - # The UBSan vptr sanitizer needs RTTI. |
265 |
| - ${{ matrix.ubsan && '-DLLVM_ENABLE_RTTI=ON' }} |
266 |
| - # The LLVM_USE_SANITIZER option doesn't support GCC. |
267 |
| - ${{ !matrix.compiler == 'gcc' && matrix.ubsan && '-DLLVM_USE_SANITIZER=Undefined' }} |
| 266 | + -DLLVM_USE_SANITIZER=${{ matrix.llvm-sanitizer-config }} |
268 | 267 | cc: ${{ steps.setup-cpp.outputs.cc }}
|
269 | 268 | cxx: ${{ steps.setup-cpp.outputs.cxx }}
|
270 | 269 | generator: Ninja
|
|
0 commit comments