RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '863ee06809b215895ee20cbc557eeceb904cf770' 

* commit '863ee06809b215895ee20cbc557eeceb904cf770':
  configure: Use the right local variable in the MSVC and ICL probes

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-03 01:20:24 +02:00
parent 0ba65c9f79 863ee06809
commit 02b5af7744
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3538,7 +3538,7 @@ probe_cc(){
_flags_filter=armasm_flags _flags_filter=armasm_flags
elif $_cc 2>&1 | grep -q Intel; then elif $_cc 2>&1 | grep -q Intel; then
_type=icl _type=icl
_ident=$($cc 2>&1 | head -n1) _ident=$($_cc 2>&1 | head -n1)
_depflags='-QMMD -QMF$(@:.o=.d) -QMT$@' _depflags='-QMMD -QMF$(@:.o=.d) -QMT$@'
# Not only is O3 broken on 13.x+ but it is slower on all previous # Not only is O3 broken on 13.x+ but it is slower on all previous
# versions (tested) as well. # versions (tested) as well.
@ -3565,7 +3565,7 @@ probe_cc(){
disable stripping disable stripping
elif $_cc 2>&1 | grep -q Microsoft; then elif $_cc 2>&1 | grep -q Microsoft; then
_type=msvc _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)' _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' _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
_cflags_speed="-O2" _cflags_speed="-O2"