ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Fri May 19 11:54:30 2017 +0200| [f78f3df7e01c266e83a98285fa3b5cd5823dab4d] | committer: Clément Bœsch
Merge commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be' * commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be': configure: Move optflags checks to a more sensible place Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f78f3df7e01c266e83a98285fa3b5cd5823dab4d --- configure | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 250e067df4..33eb628f16 100755 --- a/configure +++ b/configure @@ -6265,6 +6265,9 @@ check_optflags(){ enabled lto && check_ldflags "$@" } +check_optflags $optflags +check_optflags -fno-math-errno +check_optflags -fno-signed-zeros if enabled lto; then test "$cc_type" != "$ld_type" && die "LTO requires same compiler and linker" @@ -6273,10 +6276,6 @@ if enabled lto; then disable inline_asm_direct_symbol_refs fi -check_optflags $optflags -check_optflags -fno-math-errno -check_optflags -fno-signed-zeros - enabled ftrapv && check_cflags -ftrapv check_cc -mno-red-zone <<EOF && noredzone_flags="-mno-red-zone" ====================================================================== diff --cc configure index 250e067df4,e79c6225fb..33eb628f16 --- a/configure +++ b/configure @@@ -6270,20 -4934,8 +6273,16 @@@ if enabled lto; the test "$cc_type" != "$ld_type" && die "LTO requires same compiler and linker" check_cflags -flto check_ldflags -flto $cpuflags + disable inline_asm_direct_symbol_refs fi - check_optflags $optflags - check_optflags -fno-math-errno - check_optflags -fno-signed-zeros - +enabled ftrapv && check_cflags -ftrapv + +check_cc -mno-red-zone <<EOF && noredzone_flags="-mno-red-zone" +int x; +EOF + + if enabled icc; then # Just warnings, no remarks check_cflags -w1 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog