svn commit: r293109 - in stable: 10/share/mk 9/share/mk

[Dimitry Andric]

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