aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSteve Lhomme <robux4@gmail.com>2015-07-23 19:25:44 +0200
committerMartin Storsjö <martin@martin.st>2015-07-23 22:28:08 +0300
commita54e720e0289433d6bc3f7ba0a37fa5cabfaeea9 (patch)
tree62ce49c9326efdb15f49fb30ba0967c2f3cb3107 /configure
parent44f7df0c987965763c609f6dc36974b04182e58d (diff)
downloadffmpeg-a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9.tar.gz
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@martin.st>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 16bf852181..ac2a71d591 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$@'