From patchwork Fri Jan 15 22:12:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Reimar_D=C3=B6ffinger?= X-Patchwork-Id: 24965 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6774D44AE8C for ; Sat, 16 Jan 2021 00:12:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4561E688050; Sat, 16 Jan 2021 00:12:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9B1C6801A4 for ; Sat, 16 Jan 2021 00:12:51 +0200 (EET) Received: from localhost.localdomain ([81.170.149.220]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MMWcT-1lJ1vR3Z7X-00JY6M; Fri, 15 Jan 2021 23:12:50 +0100 From: Reimar.Doeffinger@gmx.de To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jan 2021 23:12:47 +0100 Message-Id: <20210115221247.1418-1-Reimar.Doeffinger@gmx.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Provags-ID: V03:K1:mecoqgxfy0CPO+NrdeQaWmh0Yc1FFWF74UHv+kb4bSwYvjfcOsZ jLWn9VahOczRwf9eos3XSdykDlE4vT/VCPKtwd8WnD4ZsvNLEmezyJUSNpNYGmARU5dg64j 3Y88lBLH4DVNH9mMht3qjOtVA1Hw+yw/yQgWoMK/tmyekUWikQLRVrQD7uqA3MdZ/345IHP 6HR0OXY+the87/eveh0/Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:PiB14wfrUsY=:nEdK1MzvdBlYWKbSNIDW4w 9rK8kqui0BlXV8nK7KzdtTFJdBUWYRK2fiDSB8RfvpiAkDmMtfsV+XVn9B7fOdO1ojg2tpaRl ybO2O7Tez1twxvoZfJXShz3hIgleENzGE9b7VozDRQTBl1TCELeztCu5CPMzhZj+o4tWRC11o 1D4mJpo9KtKXMgm47bawp+leRppgvppVZx3CvlmfiD+X+e1g+Nh9aM2W7r6Bc4JpHBx9j3w4D CzzuLOGcPuL+cTmu6iMgs+JJafpk+5LlWqHLqS2j7hs9JiaxtH3iGDsdoYbCAIqtjiz8CRSwq yqsNsXyl4ry74/CCcH9ZCBorBAnFpBgrid9yo/bFw4oTVc1yyAbh3oyZVXwvo9voNQm7BEZTC N7Km7xA+VmWQsCA642GJmSUaZGZnUx+ous/R1F5oZBqvonflp3uQT12sCnt3pEPtxpZu7tkQq 1gnvyfkYUw== Subject: [FFmpeg-devel] [PATCH] configure: Set MSVC as_default later. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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?Reimar_D=C3=B6ffinger?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Reimar Döffinger It would get immediately overridden to $cc, which in case of gas-preprocessor missing would result in it trying to use cl.exe for asm files instead of erroring out. This is because cl.exe does not fail but just print a warning when it is given a file it does not know what to do with it... --- configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 12b41cde1c..d3b665f6f9 100755 --- a/configure +++ b/configure @@ -4271,14 +4271,6 @@ case "$toolchain" in ld_default="$source_path/compat/windows/mslink" nm_default="dumpbin.exe -symbols" ar_default="lib.exe" - case "$arch" in - aarch64|arm64) - as_default="armasm64.exe" - ;; - arm*) - as_default="armasm.exe" - ;; - esac target_os_default="win32" # Use a relative path for TMPDIR. This makes sure all the # ffconf temp files are written with a relative path, avoiding @@ -4720,6 +4712,14 @@ probe_cc(){ _ld_path='-libpath:' elif $_cc -nologo- 2>&1 | grep -q Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then _type=msvc + case "$arch" in + aarch64|arm64) + as_default="armasm64.exe" + ;; + arm*) + as_default="armasm.exe" + ;; + esac if $_cc -nologo- 2>&1 | grep -q Microsoft; then _ident=$($_cc 2>&1 | head -n1 | tr -d '\r') else