Previously only the C compiler was set, which would lead to
confusing situations where even though clang-asan was selected,
it would still use g++ for C++ code, failing because configure
does not support mixing compilers in this way (which is a separate
issue not addressed by this commit).
---
configure | 70 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 41 insertions(+), 29 deletions(-)
diff --git a/configure b/configure
index ad5bf6d6844..29bac713df0 100755
--- a/configure
+++ b/configure
@@ -4547,41 +4547,53 @@ test -n "$valgrind" && toolchain="valgrind-memcheck"
enabled ossfuzz && ! echo $CFLAGS | grep -q -- "-fsanitize=" && ! echo
$CFLAGS | grep -q -- "-fcoverage-mapping" &&{
add_cflags -fsanitize=address,undefined
-fsanitize-coverage=trace-pc-guard,trace-cmp -fno-omit-frame-pointer
add_ldflags -fsanitize=address,undefined
-fsanitize-coverage=trace-pc-guard,trace-cmp
}
+add_sanitizer_flags(){
+ case "$1" in
+ asan)
+ add_cflags -fsanitize=address
+ add_ldflags -fsanitize=address
+ ;;
+ lsan)
+ add_cflags -fsanitize=leak
+ add_ldflags -fsanitize=leak
+ ;;
+ msan)
+ add_cflags -fsanitize=memory -fsanitize-memory-track-origins
+ add_ldflags -fsanitize=memory
+ ;;
+ tsan)
+ add_cflags -fsanitize=thread
+ add_ldflags -fsanitize=thread
+ ;;
+ usan)
+ add_cflags -fsanitize=undefined
+ add_ldflags -fsanitize=undefined
+ ;;
+ ?*)
+ die "Unknown sanitizer $1"
+ ;;
+ esac
+}
+
case "$toolchain" in
- *-asan)
- cc_default="${toolchain%-asan}"
- add_cflags -fsanitize=address
- add_ldflags -fsanitize=address
- ;;
- *-lsan)
- cc_default="${toolchain%-lsan}"
- add_cflags -fsanitize=leak
- add_ldflags -fsanitize=leak
- ;;
- *-msan)
- cc_default="${toolchain%-msan}"
- add_cflags -fsanitize=memory -fsanitize-memory-track-origins
- add_ldflags -fsanitize=memory
- ;;
- *-tsan)
- cc_default="${toolchain%-tsan}"
- add_cflags -fsanitize=thread
- add_ldflags -fsanitize=thread
- case "$toolchain" in
- gcc-tsan)
- add_cflags -fPIC
- add_ldflags -fPIC
- ;;
- esac
+ clang-*)
+ add_sanitizer_flags "${toolchain#clang-}"
+ cc_default="clang"
+ cxx_default="clang++"
;;
- *-usan)
- cc_default="${toolchain%-usan}"
- add_cflags -fsanitize=undefined
- add_ldflags -fsanitize=undefined
+ gcc-*)
+ add_sanitizer_flags "${toolchain#gcc-}"
+ cc_default="gcc"
+ cxx_default="g++"
+ # In case of tsan with gcc, PIC has to be enabled
+ if [ "${toolchain#gcc-}" = "tsan" ]; then
+ add_cflags -fPIC
+ add_ldflags -fPIC
+ fi
;;
valgrind-*)
target_exec_default="valgrind"
case "$toolchain" in
valgrind-massif)
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
