RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 02:12:28 +00:00
Code Issues Projects Releases Wiki Activity

configure: Use the right local variable in the MSVC and ICL probes

Browse Source 
$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ö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-06-05 22:59:47 +03:00
parent 709e1c91ea
commit 863ee06809
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

@ -2972,7 +2972,7 @@ probe_cc(){
_flags_filter=armasm_flags _flags_filter=armasm_flags
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"
@ -2994,7 +2994,7 @@ probe_cc(){
fi fi
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.