github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-26 12:30:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't override libc++

Browse Source
This commit is contained in:
Dominic Hamon 2021-06-04 15:50:08 +01:00
parent dae05dfca3
commit 2a3ad8c6e8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/.libcxx-setup.sh vendored
View File

@ -13,7 +13,7 @@ cd ./llvm-project
cmake -DCMAKE_C_COMPILER=${C_COMPILER} \ cmake -DCMAKE_C_COMPILER=${C_COMPILER} \
-DCMAKE_CXX_COMPILER=${COMPILER} \ -DCMAKE_CXX_COMPILER=${COMPILER} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr/local \
-DLIBCXX_ABI_UNSTABLE=OFF \ -DLIBCXX_ABI_UNSTABLE=OFF \
-DLLVM_USE_SANITIZER=${LIBCXX_SANITIZER} \ -DLLVM_USE_SANITIZER=${LIBCXX_SANITIZER} \
-DLLVM_BUILD_32_BITS=${BUILD_32_BITS} \ -DLLVM_BUILD_32_BITS=${BUILD_32_BITS} \

9
.github/workflows/sanitizer.yml vendored
View File

@ -7,6 +7,7 @@ on:
env: env:
CC: clang CC: clang
CXX: clang++ CXX: clang++
EXTRA_FLAGS: "-g -O2 -fno-omit-frame-pointer -L/usr/local/lib -I/usr/local/include -I/usr/local/include/c++/v1"
EXTRA_CXX_FLAGS: "-stdlib=libc++" EXTRA_CXX_FLAGS: "-stdlib=libc++"
UBSAN_OPTIONS: "print_stacktrace=1" UBSAN_OPTIONS: "print_stacktrace=1"
@ -25,25 +26,25 @@ jobs:
- name: configure msan env - name: configure msan env
if: matrix.sanitizer == 'msan' if: matrix.sanitizer == 'msan'
run: | run: |
echo "EXTRA_FLAGS=-g -O2 -fno-omit-frame-pointer -fsanitize=memory -fsanitize-memory-track-origins" >> $GITHUB_ENV echo "EXTRA_FLAGS=$EXTRA_FLAGS -fsanitize=memory -fsanitize-memory-track-origins" >> $GITHUB_ENV
echo "LIBCXX_SANITIZER=MemoryWithOrigins" >> $GITHUB_ENV echo "LIBCXX_SANITIZER=MemoryWithOrigins" >> $GITHUB_ENV
- name: configure ubsan env - name: configure ubsan env
if: matrix.sanitizer == 'ubsan' if: matrix.sanitizer == 'ubsan'
run: | run: |
echo "EXTRA_FLAGS=-g -O2 -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all" >> $GITHUB_ENV echo "EXTRA_FLAGS=$EXTRA_FLAGS -fsanitize=undefined -fno-sanitize-recover=all" >> $GITHUB_ENV
echo "LIBCXX_SANITIZER=Undefined" >> $GITHUB_ENV echo "LIBCXX_SANITIZER=Undefined" >> $GITHUB_ENV
- name: configure asan env - name: configure asan env
if: matrix.sanitizer == 'asan' if: matrix.sanitizer == 'asan'
run: | run: |
echo "EXTRA_FLAGS=-g -O2 -fno-omit-frame-pointer -fsanitize=address -fno-sanitize-recover=all" >> $GITHUB_ENV echo "EXTRA_FLAGS=$EXTRA_FLAGS -fsanitize=address -fno-sanitize-recover=all" >> $GITHUB_ENV
echo "LIBCXX_SANITIZER=Address" >> $GITHUB_ENV echo "LIBCXX_SANITIZER=Address" >> $GITHUB_ENV
- name: configure tsan env - name: configure tsan env
if: matrix.sanitizer == 'tsan' if: matrix.sanitizer == 'tsan'
run: | run: |
echo "EXTRA_FLAGS=-g -O2 -fno-omit-frame-pointer -fsanitize=thread -fno-sanitize-recover=all" >> $GITHUB_ENV echo "EXTRA_FLAGS=$EXTRA_FLAGS -fsanitize=thread -fno-sanitize-recover=all" >> $GITHUB_ENV
echo "LIBCXX_SANITIZER=Thread" >> $GITHUB_ENV echo "LIBCXX_SANITIZER=Thread" >> $GITHUB_ENV
- name: install llvm stuff - name: install llvm stuff