svn commit: r293014 - head/share/mk
Dimitry Andric
dim at FreeBSD.org
Thu Dec 31 22:48:47 UTC 2015
Author: dim
Date: Thu Dec 31 22:48:46 2015
New Revision: 293014
URL: https://svnweb.freebsd.org/changeset/base/293014
Log:
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.
MFC after: 3 days
Modified:
head/share/mk/bsd.compiler.mk
Directory Properties:
head/ (props changed)
head/share/ (props changed)
Modified: head/share/mk/bsd.compiler.mk
==============================================================================
--- head/share/mk/bsd.compiler.mk Thu Dec 31 22:45:00 2015 (r293013)
+++ head/share/mk/bsd.compiler.mk Thu Dec 31 22:48:46 2015 (r293014)
@@ -138,7 +138,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
More information about the svn-src-all
mailing list