---
configure | 120 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/configure b/configure
index b83f9a3..36bee8f 100755
--- a/configure
+++ b/configure
@@ -2248,66 +2248,6 @@ strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include"
-case "$toolchain" in
- clang-asan)
- cc_default="clang"
- add_cflags -fsanitize=address
- add_ldflags -fsanitize=address
- ;;
- clang-tsan)
- cc_default="clang"
- add_cflags -fsanitize=thread -pie
- add_ldflags -fsanitize=thread -pie
- ;;
- 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
- ;;
- valgrind-massif)
- target_exec_default="valgrind"
- target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
- ;;
- valgrind-memcheck)
- target_exec_default="valgrind"
- target_exec_args="--track-origins=yes --leak-check=full"
- ;;
- msvc)
- cc_default="c99wrap cl"
- ld_default="c99wrap link"
- nm_default="dumpbin -symbols"
- ar_default="lib"
- target_os_default="win32"
- ;;
- icl)
- cc_default="c99wrap -noconv icl"
- ld_default="c99wrap xilink"
- nm_default="dumpbin -symbols"
- ar_default="xilib"
- target_os_default="win32"
- ;;
- gcov)
- add_cflags -fprofile-arcs -ftest-coverage
- add_ldflags -fprofile-arcs -ftest-coverage
- ;;
- hardened)
- add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow
-fstack-protector-all
- add_ldflags -Wl,-z,relro -Wl,-z,now
- ;;
- ?*)
- die "Unknown toolchain $toolchain"
- ;;
-esac
-
-set_default arch cc pkg_config sysinclude target_exec target_os
-enabled cross_compile || host_cc_default=$cc
-set_default host_cc
-
if ! $pkg_config --version >/dev/null 2>&1; then
warn "$pkg_config not found, library detection may fail."
pkg_config=false
@@ -2371,6 +2311,66 @@ EOF
die "Sanity test failed."
fi
+case "$toolchain" in
+ clang-asan)
+ cc_default="clang"
+ add_cflags -fsanitize=address
+ add_ldflags -fsanitize=address
+ ;;
+ clang-tsan)
+ cc_default="clang"
+ add_cflags -fsanitize=thread -pie
+ add_ldflags -fsanitize=thread -pie
+ ;;
+ 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
+ ;;
+ valgrind-massif)
+ target_exec_default="valgrind"
+ target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
+ ;;
+ valgrind-memcheck)
+ target_exec_default="valgrind"
+ target_exec_args="--track-origins=yes --leak-check=full"
+ ;;
+ msvc)
+ cc_default="c99wrap cl"
+ ld_default="c99wrap link"
+ nm_default="dumpbin -symbols"
+ ar_default="lib"
+ target_os_default="win32"
+ ;;
+ icl)
+ cc_default="c99wrap -noconv icl"
+ ld_default="c99wrap xilink"
+ nm_default="dumpbin -symbols"
+ ar_default="xilib"
+ target_os_default="win32"
+ ;;
+ gcov)
+ add_cflags -fprofile-arcs -ftest-coverage
+ add_ldflags -fprofile-arcs -ftest-coverage
+ ;;
+ hardened)
+ add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow
-fstack-protector-all
+ add_ldflags -Wl,-z,relro -Wl,-z,now
+ ;;
+ ?*)
+ die "Unknown toolchain $toolchain"
+ ;;
+esac
+
+set_default arch cc pkg_config sysinclude target_exec target_os
+enabled cross_compile || host_cc_default=$cc
+set_default host_cc
+
ccc_flags(){
for flag; do
case $flag in
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
