[FFmpeg-cvslog] configure: force -nologo- when detecting MSVC
Steve Lhomme
git at videolan.org
Fri Jul 24 00:53:06 CEST 2015
ffmpeg | branch: master | Steve Lhomme <robux4 at gmail.com> | Thu Jul 23 19:25:44 2015 +0200| [a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9] | committer: Martin Storsjö
configure: force -nologo- when detecting MSVC
The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 16bf852..ac2a71d 100755
--- a/configure
+++ b/configure
@@ -3033,14 +3033,14 @@ probe_cc(){
# 4509: "This form of conditional instruction is deprecated"
_flags="-nologo -ignore 4509"
_flags_filter=armasm_flags
- elif $_cc 2>&1 | grep -q Microsoft; then
+ elif $_cc -nologo- 2>&1 | grep -q Microsoft; then
_type=msvc
_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"
_cflags_size="-O1"
- if $_cc 2>&1 | grep -q Linker; then
+ if $_cc -nologo- 2>&1 | grep -q Linker; then
_ld_o='-out:$@'
else
_ld_o='-Fe$@'
More information about the ffmpeg-cvslog
mailing list