From owner-svn-ports-all@FreeBSD.ORG Sun Jun 29 20:35:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5766D4B6; Sun, 29 Jun 2014 20:35:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 442EB277A; Sun, 29 Jun 2014 20:35:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5TKZ6dU023337; Sun, 29 Jun 2014 20:35:06 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5TKZ6IL023336; Sun, 29 Jun 2014 20:35:06 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201406292035.s5TKZ6IL023336@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 29 Jun 2014 20:35:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359791 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2014 20:35:06 -0000 Author: nwhitehorn (src committer) Date: Sun Jun 29 20:35:05 2014 New Revision: 359791 URL: http://svnweb.freebsd.org/changeset/ports/359791 QAT: https://qat.redports.org/buildarchive/r359791/ Log: Avoid using clang as a fallback compiler on Tier-2 systems for C++0x or C11 features on platforms where it is not known to work. Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Sun Jun 29 19:39:08 2014 (r359790) +++ head/Mk/Uses/compiler.mk Sun Jun 29 20:35:05 2014 (r359791) @@ -166,7 +166,7 @@ LDFLAGS+= -B${LOCALBASE}/bin .if ${_COMPILER_ARGS:Mc++0x} .if !${COMPILER_FEATURES:Mc++0x} -.if defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc +.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc @@ -192,7 +192,7 @@ LDFLAGS+= -B${LOCALBASE}/bin .if ${_COMPILER_ARGS:Mc11} .if !${COMPILER_FEATURES:Mc11} -.if defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc +.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc