ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Thu Jun 5 22:59:47 2014 +0300| [863ee06809b215895ee20cbc557eeceb904cf770] | committer: Martin Storsjö
configure: Use the right local variable in the MSVC and ICL probes $cc is the compiler requested as main target compiler, while $_cc is the actual tool tested in the probe function right now (which can also be e.g. the host compiler). Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=863ee06809b215895ee20cbc557eeceb904cf770 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c5ea29c..6bfd304 100755 --- a/configure +++ b/configure @@ -2972,7 +2972,7 @@ probe_cc(){ _flags_filter=armasm_flags elif $_cc 2>&1 | grep -q Microsoft; then _type=msvc - _ident=$($cc 2>&1 | head -n1) + _ident=$($_cc 2>&1 | head -n1) _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)' _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs' _cflags_speed="-O2" @@ -2994,7 +2994,7 @@ probe_cc(){ fi elif $_cc 2>&1 | grep -q Intel; then _type=icl - _ident=$($cc 2>&1 | head -n1) + _ident=$($_cc 2>&1 | head -n1) _depflags='-QMMD -QMF$(@:.o=.d) -QMT$@' # Not only is O3 broken on 13.x+ but it is slower on all previous # versions (tested) as well. _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog