From patchwork Thu Feb 1 10:52:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bilyak X-Patchwork-Id: 7469 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp2902565jak; Thu, 1 Feb 2018 02:52:50 -0800 (PST) X-Google-Smtp-Source: AH8x225b1tnc7lrIVCjiXnosOnb5xhQ4NaDiNTUhFGDgt1TzRyp7epJOyIr1YhBDXbkUAKjuPJfM X-Received: by 10.223.190.143 with SMTP id i15mr13143003wrh.145.1517482370329; Thu, 01 Feb 2018 02:52:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517482370; cv=none; d=google.com; s=arc-20160816; b=kfKDSB3clzYwzkS/GrbxXbHG0dY9p+59ibOYQG06vT4RQ4DteO8WVSLhZs+KTi45fq ddM7+sou9ZHOpEMW6RDNUMUr8hR3fFLDArkGpAL9Po3jbJ71ciw9td1By3TDO98mZ9QS aJDYLwC/XDFmPbz2l7noGUXrRGdOt3as51vM+3dd0GhLBddwOgC/prEmdbH8MgDm3SRv /oUQBqubpLvM7TIEi6cnYzlEKiMh6i16Rha884Rg3bLCRdzNaFMTawCBetm62P/mM5+L cro6Y5ZZTJ7TJKArY7nJrXpQW4DqVTKJwgU9HmHQMb4NwYaR7IMey66JPZfRGyMTkRIf 8nCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=RXZRS1/CaM3wPhlOtj6xsZgUT2aD5pk87IU3XQxFrQQ=; b=fkw1C8coLc01OblCVg+o5Ujwad+Vuaqvy7ezyRlvZUU6ktRJzWus8S1hxz6FR7GJSf /xyX+Ocdk5PYKXi3IGfKOQ4ya3rvdXn3UbrcpP7+Uty1P8qe84BSLGEbnix9y+SgTssY bUTiNZlokCs6bj6t/vauJmC+R9Qeyl0pI5ttfYHEagNuNNGF97WNezrCALkVb6u4PbMM qA0t+U7n9nW/6Dg84t29W0iv7S5zIhRgB4yDDNyrRaUkfZeJSeoDaH69TScUawzcNlLx 6HaF9I+3U6PHj5Rq/Q+Bq+SH96yyOkPThgZsNFlX70RW6OjfPa6VdE6Wgb+k34hiQPee y07w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P58c+2Wj; 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=NONE 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 e24si9403841wra.463.2018.02.01.02.52.49; Thu, 01 Feb 2018 02:52:50 -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=20161025 header.b=P58c+2Wj; 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=NONE 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 435BE689AAE; Thu, 1 Feb 2018 12:52:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F61F6883C9 for ; Thu, 1 Feb 2018 12:52:35 +0200 (EET) Received: by mail-wr0-f181.google.com with SMTP id t94so6894516wrc.5 for ; Thu, 01 Feb 2018 02:52:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BuvofqUwZqglKNA2sBkDG1P2fiPHtpcqTDoZLmEVI0E=; b=P58c+2WjDnN9ZgC4bWMBVWnYquu+9s8O6bpFLfVIasOspN1xbbrlJ7rMGsjxe1IIX3 /1onUJHWFzcZiafa46kl/FtgGruWcmKvOh/WUZqO9se+3+jr7lAIP3T6UB+qztDH0oI9 vgwh+axfmhRiPKYq8tPWsZ1W70O2zudJcKegIZDx4o/oAGpIqnzISFJ0aREe1BD0vGWX 1USYIV2YeHxxUlm2awOrPuk5+kKdXPBmJ2fmyztBYvsUOC5DNcXTRdViCUM6ZlM+W4Xs bMr78nfLdbXQqiE/9IpIRcs02u1Fu1z4G5uAvFBZZYk6bEY2on/foPq4q/t2/OCGlR0C E7bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BuvofqUwZqglKNA2sBkDG1P2fiPHtpcqTDoZLmEVI0E=; b=RvW8QljeW5fvUY6gBleiJICezYySYe4LNCgvi9HAgJUN8/iJJs3v0IpWsqhismvTaS eA8X/Jvh2nr3mbhX2jwb4lnZX3SOxc2RDY85gDUCil6QNxMmdk7tz6e3f3i6vy+5tTgw V3I0N7jbnVgQiziNY3xjFYMYvSjdVyoYNCOFcm5RZft5F4FpUJ0Cjb3INRazAnTovNcS lyklO/wIvSNvP3VNvDH8tTCGvMCILDzUMr+djDoqu1BjphFOtB3eV4r9ePTzIHhfJEiR OTBIA2HjZxqV10JLXRjFNuq+gKdX4FvKenmSSEw7vS8Xmgzmam9sB1UXLqHNCySnToXi DFVw== X-Gm-Message-State: AKwxytfDpYJYT3us4g5EFfAMxTGevO1QP/8SOSUCmS1vOwOT83STqI0Y nZbXu12N6DFjzzVdk80p9EjFKx4l X-Received: by 10.223.172.116 with SMTP id v107mr19436673wrc.269.1517482360571; Thu, 01 Feb 2018 02:52:40 -0800 (PST) Received: from RD-PC.astim.local (host113-234-static.10-188-b.business.telecomitalia.it. [188.10.234.113]) by smtp.gmail.com with ESMTPSA id b133sm2068214wmh.4.2018.02.01.02.52.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Feb 2018 02:52:39 -0800 (PST) From: Alexander Bilyak To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Feb 2018 11:52:24 +0100 Message-Id: <20180201105224.11216-1-bilyak.alexander@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] configure: fix clang-cl detection 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When using clang-cl it expects parameters passed in MSVC-style, so appropriate toolchain should be selected. As soon as both clang and clang-cl report themselfs as "clang" with -v option the only chance to detect clang-cl is passing -? option to both which is valid for clang-cl.exe and not for clang.exe. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fcfa7aa442..f8c55876e5 100755 --- a/configure +++ b/configure @@ -4216,7 +4216,7 @@ probe_cc(){ _depflags='-MMD' _cflags_speed='-O3' _cflags_size='-Os' - elif $_cc -v 2>&1 | grep -q clang; then + elif $_cc -v 2>&1 | grep -q clang && ! $_cc -? > /dev/null 2>&1; then _type=clang _ident=$($_cc --version 2>/dev/null | head -n1) _depflags='-MMD -MF $(@:.o=.d) -MT $@' @@ -4287,7 +4287,7 @@ probe_cc(){ _flags_filter=msvc_flags _ld_lib='lib%.a' _ld_path='-libpath:' - elif $_cc -nologo- 2>&1 | grep -q Microsoft; then + elif $_cc -nologo- 2>&1 | grep -q Microsoft || $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; 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)'