[FFmpeg-cvslog] configure: Refactor toolchain flag setting
Diego Biurrun
git at videolan.org
Tue Feb 16 18:45:59 CET 2016
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Feb 6 17:31:14 2016 +0100| [34c9eba982c75196392a3b0b245dd34297c4511d] | committer: Luca Barbato
configure: Refactor toolchain flag setting
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34c9eba982c75196392a3b0b245dd34297c4511d
---
configure | 53 ++++++++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/configure b/configure
index 46b768c..272bb1e 100755
--- a/configure
+++ b/configure
@@ -2718,43 +2718,42 @@ echo "# $0 $LIBAV_CONFIGURATION" > $logfile
set >> $logfile
case "$toolchain" in
- clang-asan)
- cc_default="clang"
+ *-asan)
+ cc_default="${toolchain%-asan}"
add_cflags -fsanitize=address
add_ldflags -fsanitize=address
;;
- clang-tsan)
- cc_default="clang"
+ *-tsan)
+ cc_default="${toolchain%-tsan}"
add_cflags -fsanitize=thread -pie
add_ldflags -fsanitize=thread -pie
+ case "$toolchain" in
+ gcc-tsan)
+ add_cflags -fPIC
+ add_ldflags -fPIC
+ ;;
+ esac
;;
- clang-usan)
- cc_default="clang"
- add_cflags -fsanitize=undefined -O1
- add_ldflags -fsanitize=undefined
- ;;
- gcc-asan)
- cc_default="gcc"
- add_cflags -fsanitize=address
- add_ldflags -fsanitize=address
- ;;
- gcc-tsan)
- cc_default="gcc"
- add_cflags -fsanitize=thread -pie -fPIC
- add_ldflags -fsanitize=thread -pie -fPIC
- ;;
- gcc-usan)
- cc_default="gcc"
+ *-usan)
+ cc_default="${toolchain%-usan}"
add_cflags -fsanitize=undefined
add_ldflags -fsanitize=undefined
+ case "$toolchain" in
+ clang-usan)
+ add_cflags -O1
+ ;;
+ esac
;;
- valgrind-massif)
- target_exec_default="valgrind"
- target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
- ;;
- valgrind-memcheck)
+ valgrind-*)
target_exec_default="valgrind"
- target_exec_args="--track-origins=yes --leak-check=full"
+ case "$toolchain" in
+ valgrind-massif)
+ target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
+ ;;
+ valgrind-memcheck)
+ target_exec_args="--track-origins=yes --leak-check=full"
+ ;;
+ esac
;;
msvc)
# Check whether the current MSVC version needs the C99 converter.
More information about the ffmpeg-cvslog
mailing list