From owner-svn-src-all@freebsd.org  Sun Jan  3 17:19:18 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4A0BA60123;
 Sun,  3 Jan 2016 17:19:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B27561987;
 Sun,  3 Jan 2016 17:19:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u03HJHXf075637;
 Sun, 3 Jan 2016 17:19:17 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u03HJHBB075636;
 Sun, 3 Jan 2016 17:19:17 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201601031719.u03HJHBB075636@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 3 Jan 2016 17:19:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r293109 - in stable: 10/share/mk 9/share/mk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jan 2016 17:19:19 -0000

Author: dim
Date: Sun Jan  3 17:19:17 2016
New Revision: 293109
URL: https://svnweb.freebsd.org/changeset/base/293109

Log:
  MFC r293014:
  
  Merge r293006 from clang380-import branch:
  
  For determining the compiler version, quote the string to be echo'd,
  otherwise the command might fail.  This is because clang -v now results
  in the following:
  
  FreeBSD clang version 3.8.0 (trunk 256633) (based on LLVM 3.8.0svn)
  
  The second "3.8.8svn)" string tripped up the shell command.

Modified:
  stable/9/share/mk/bsd.compiler.mk
Directory Properties:
  stable/9/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/mk/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/share/mk/bsd.compiler.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/share/mk/bsd.compiler.mk
==============================================================================
--- stable/9/share/mk/bsd.compiler.mk	Sun Jan  3 16:13:03 2016	(r293108)
+++ stable/9/share/mk/bsd.compiler.mk	Sun Jan  3 17:19:17 2016	(r293109)
@@ -40,7 +40,7 @@ COMPILER_TYPE:=	clang
 . endif
 .endif
 .if !defined(COMPILER_VERSION)
-COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]*} | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
+COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
 .endif
 .undef _v
 .endif