svn commit: r286032 - head/share/mk

[Ed Maste]

Author: emaste
Date: Wed Jul 29 19:06:53 2015
New Revision: 286032
URL: https://svnweb.freebsd.org/changeset/base/286032

Log:
  Use default CLANG build options for ARM
  
  We previously disabled CLANG_FULL on (little-endian) ARM because the
  build failed.  This is no longer the case and as of Clang 3.5 we cannot
  build any part of the in-tree Clang with in-tree GCC, so it's no longer
  necessary to disable CLANG_FULL.
  
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D2525

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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Wed Jul 29 18:55:51 2015	(r286031)
+++ head/share/mk/src.opts.mk	Wed Jul 29 19:06:53 2015	(r286032)
@@ -214,15 +214,11 @@ __TT=${MACHINE}
 # If the compiler is not C++11 capable, disable clang and use gcc instead.
 __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
-.elif ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386"
-# On x86 and arm64, clang is enabled, and will be installed as the default cc.
+.elif ${__T} == "aarch64" || ${__T} == "amd64" || ${__TT} == "arm" || \
+    ${__T} == "i386"
+# On x86 and arm, clang is enabled, and will be installed as the default cc.
 __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
 __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
-.elif ${__TT} == "arm"
-# On arm, clang is enabled, and it is installed as the default cc, but
-# since gcc is unable to build the full clang, disable it by default.
-__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_CC
-__DEFAULT_NO_OPTIONS+=CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
 .elif ${__T:Mpowerpc*}
 # On powerpc, clang is enabled, but gcc is installed as the default cc.
 __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX