From patchwork Sat Jan 22 20:13:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kacper_Michaj=C5=82ow?= X-Patchwork-Id: 33748 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1513032iog; Sat, 22 Jan 2022 12:14:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzSHH8vR7ClWH+TzGnpzQxRdPXP59nIteX3mlhrUJi4y3+qr5/Q5JILSj8PA4TUGe/X8Gr X-Received: by 2002:a05:6402:1686:: with SMTP id a6mr9208820edv.90.1642882459281; Sat, 22 Jan 2022 12:14:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642882459; cv=none; d=google.com; s=arc-20160816; b=gLLlWJCbp4d69+qFrPQ6O40+AutadUxk9oZRLeS8wuN5tJ6zek8HA5UXaz/gSKbQhp wiqsJ/j/Y0UvK03/MsSO1ZhCfYdcW+vmTaHULmkPjTwoDPGlXVtSlEQaotyoxVV37tKB 06EuxDZbMNRDkNltlEp8lw+hrXrAR8DCeCo6kpBD66/hhIRylG27VDze0GWbnu+RE3wQ +/HxXZmJWNF1Ytnf3za3h9r9Zm/k+YEAO8/PbYnmWsZtYUqlFP4dS0SRvt+gtWwxnXVf A75hf4UcSzfgJreJtP8axuzR835pAvLmy2zYMuFhgWDXPoaVv0vwGttkW1/B6DcNAt7+ 51yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=r2hcw1VQNdycFPYJD7xwj3g7ahKYtq5oeRDrQSGaQyk=; b=SLeB+eNNoI9kQPyLyENM1ahDj+CNw6u0uuq5KznvAjtmiOefG39bnIz7j/u1NQ8hsy Af/UpQFQllWKojT3W2dVl3LXBauVqyOkuoXkfGJ73kxbiXOH/q5BqEj2T09xJxxxOhN3 iiGop7U6YbKEFaxtWD68DOdxF4UFu1DNl9XmWo851SzaUrLhboCcr5HJ6gjEZsSNSYJ+ 4GAFTF1G17w/XvGa3DlwwXwbaARATjtRDgaD/Mg4zyh1jyjO4DYkweLXFLrNvdzfapII sVIf1mWXe7k5IUhyxZdLE6BThJ8qTxQ1YmMQn63+skgSAciB0S26UVO3SFfF1XzKVoBB W1NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l7jGvxzd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 12si5308801ejk.861.2022.01.22.12.14.18; Sat, 22 Jan 2022 12:14:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l7jGvxzd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2850068AFDD; Sat, 22 Jan 2022 22:14:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D81568AF80 for ; Sat, 22 Jan 2022 22:14:07 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id h29so3566438wrb.5 for ; Sat, 22 Jan 2022 12:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y3AdDUmkKadHwSr3uGbZP+wvqVF/R04QphSpZe3lBto=; b=l7jGvxzdzY+CYJidwWU9yvddLaQdbcsbT8I6KHUM0pnxgMG5+Vk/Nk6ClmD3yJIxh6 GZlLVqfzJ1r4HmxHLQuGlutzheDYkOlN9/x5QVgQ0VG1BHKUAAbe2r2yG/pkyHhwJ6Ks xywEzxHE3QS5ooTzpIFNynUG/jpttB5tZs50RBGqSh/8ANV54nbsl9gDQyToA62VT+4T /T9ttdRvHWS0Xq3zHJh74qTvuOZf3kOd8a41g2ShREjHQCQ+6fzuyvzvOygSgdhusT4N fXYP7nQ0wDqWDTOxjt3Xz3rII8kajFFxEH1+FlnKQLqCXxDcoEn51KRFjGD+Q8MPsEnK qdcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y3AdDUmkKadHwSr3uGbZP+wvqVF/R04QphSpZe3lBto=; b=pNfgx437OSSeQ3+ns3g1yTqzBD/8cpxMc7IbAIOt6Gp1m4v/SIJ4NzN1oeC2IfADvy xiHnqU5R6x99413NMWQET5XJom7zLoith8qDd2oG794HSk4byf7hq03dBnvPkk93tuqx U+UfYmCuEwVEtQKQJx3XNX9SCvk9KVg2HUlSBw8oYG1AefrBmOMot8CSwEVxP/xpDVSz 6nYW3mCLd3gpoofpudLhGThkNCKQv/myttry2UUpHRS89NjW1FZI7vX5uDmGfVuw/vq6 SWeSJcaVNxMtKoBApkjZqY5XiOy9IQrSX1qCMJGx1RkkHl+BoOIzJFEWAJobIsdbYEmq tQqQ== X-Gm-Message-State: AOAM532vdFdv4YLYZtIpp0JfwAtuorLo++IwthqUhKxoq0qGORXDboH4 gHI3wAD8qQK7DcRJoSpxnMwsVwoDqmc= X-Received: by 2002:a05:6000:1a8e:: with SMTP id f14mr8734351wry.518.1642882446624; Sat, 22 Jan 2022 12:14:06 -0800 (PST) Received: from localhost.localdomain ([2001:470:61c7:0:2528:7c9d:3a49:bac3]) by smtp.gmail.com with ESMTPSA id bg26sm14360858wmb.48.2022.01.22.12.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 12:14:06 -0800 (PST) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jan 2022 21:13:21 +0100 Message-Id: <20220122201321.8368-1-kasper93@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: Fix Microsoft tools detection X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WB/zj4c3a8hc LLVM tools print installation path upon execution. If one uses LLVM tools bundled with Microsoft Visual Studio installation, they would be incorrectly detected as Microsoft's ones. Signed-off-by: Kacper Michajłow --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 94f513288a..f27fd067eb 100755 --- a/configure +++ b/configure @@ -4820,9 +4820,9 @@ probe_cc(){ _flags_filter=msvc_flags _ld_lib='lib%.a' _ld_path='-libpath:' - elif $_cc -nologo- 2>&1 | grep -q Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then + elif $_cc -nologo- 2>&1 | grep -q 'Microsoft.*Optimizing.*Compiler' || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then _type=msvc - if $_cc -nologo- 2>&1 | grep -q Microsoft; then + if $_cc -nologo- 2>&1 | grep -q 'Microsoft.*Optimizing.*Compiler'; then _ident=$($_cc 2>&1 | head -n1 | tr -d '\r') else _ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r') @@ -4927,7 +4927,7 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then DEPCCFLAGS=$_flags fi -if $ar 2>&1 | grep -q Microsoft; then +if $ar 2>&1 | grep -q 'Microsoft.*Library.*Manager'; then arflags="-nologo" ar_o='-out:$@' elif $ar 2>&1 | grep -q "\[D\] "; then