svn commit: r320549 - head/share/mk

[Ed Maste]

Author: emaste
Date: Sat Jul  1 19:10:59 2017
New Revision: 320549
URL: https://svnweb.freebsd.org/changeset/base/320549

Log:
  Do not build clang for all riscv*, not just riscv64
  
  Previous test matching on "riscv64" was invalidated by the addition of
  riscv64sf.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat Jul  1 19:06:14 2017	(r320548)
+++ head/share/mk/src.opts.mk	Sat Jul  1 19:10:59 2017	(r320549)
@@ -222,7 +222,7 @@ __TT=${MACHINE}
 # Clang is enabled, and will be installed as the default /usr/bin/cc.
 __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD
 __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC
-.elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "riscv64" && ${__T} != "sparc64"
+.elif ${COMPILER_FEATURES:Mc++11} && ${__T:Mriscv*} == "" && ${__T} != "sparc64"
 # If an external compiler that supports C++11 is used as ${CC} and Clang
 # supports the target, then Clang is enabled but GCC is installed as the
 # default /usr/bin/cc.