Skip to content

Commit 8230e1b

Browse files
author
Maxim Egorushkin
committed
sanitize options updated.
1 parent 882cf00 commit 8230e1b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ jobs:
4646
run: make -rj2 TOOLSET=${{ matrix.toolset }} BUILD=sanitize2 run_tests
4747

4848
- name: Build and run unit tests with thread sanitizer
49-
run: sudo sysctl vm.mmap_rnd_bits=30; make -rj2 TOOLSET=${{ matrix.toolset }} BUILD=sanitize run_tests
49+
run: make -rj2 TOOLSET=${{ matrix.toolset }} BUILD=sanitize run_tests

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ cxxflags.gcc.release := -O3 -mtune=native -falign-{functions,loops}=64 -DNDEBUG
5050
cxxflags.gcc.sanitize := ${cxxflags.gcc.release} -fsanitize=thread
5151
cxxflags.gcc.sanitize2 := ${cxxflags.gcc.release} -fsanitize=undefined,address
5252
cxxflags.gcc := -march=native -f{no-plt,no-math-errno,finite-math-only,message-length=0} -W{all,extra,error,no-{array-bounds,maybe-uninitialized,unused-variable,unused-function,unused-local-typedefs}} ${cxxflags.gcc.${BUILD}}
53-
ldflags.gcc.sanitize := ${ldflags.gcc.release} -fsanitize=thread -static-libtsan
54-
ldflags.gcc.sanitize2 := ${ldflags.gcc.release} -fsanitize=undefined,address -static-lib{a,l,ub}san
53+
ldflags.gcc.sanitize := ${ldflags.gcc.release} -fsanitize=thread
54+
ldflags.gcc.sanitize2 := ${ldflags.gcc.release} -fsanitize=undefined,address
5555
ldflags.gcc := -fuse-ld=gold ${ldflags.gcc.${BUILD}}
5656

5757
# clang-14 for arm doesn't support -march=native.
@@ -63,7 +63,7 @@ cxxflags.clang.sanitize2 := ${cxxflags.clang.release} -fsanitize=undefined,addre
6363
cxxflags.clang := -stdlib=libstdc++ -f{no-plt,no-math-errno,finite-math-only,message-length=0} -W{all,extra,error,no-{unused-variable,unused-function,unused-local-typedefs}} ${cxxflags.clang.${BUILD}}
6464
ldflags.clang.debug := -latomic # A work-around for clang bug.
6565
ldflags.clang.sanitize := ${ldflags.clang.release} -fsanitize=thread
66-
ldflags.clang.sanitize2 := ${ldflags.clang.release} -fsanitize=undefined,address -static-libsan
66+
ldflags.clang.sanitize2 := ${ldflags.clang.release} -fsanitize=undefined,address
6767
ldflags.clang := -stdlib=libstdc++ ${ldflags.clang.${BUILD}}
6868

6969
# Additional CPPFLAGS, CXXFLAGS, LDLIBS, LDFLAGS can come from the command line, e.g. make CPPFLAGS='-I<my-include-dir>', or from environment variables.

0 commit comments

Comments
 (0)