From owner-svn-ports-all@FreeBSD.ORG Thu Jun 26 22:16:38 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 82C32E34; Thu, 26 Jun 2014 22:16:38 +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 6FB702EC8; Thu, 26 Jun 2014 22:16:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QMGc3s049388; Thu, 26 Jun 2014 22:16:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QMGcd8049387; Thu, 26 Jun 2014 22:16:38 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201406262216.s5QMGcd8049387@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 26 Jun 2014 22:16:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359424 - 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: Thu, 26 Jun 2014 22:16:38 -0000 Author: nwhitehorn (src committer) Date: Thu Jun 26 22:16:37 2014 New Revision: 359424 URL: http://svnweb.freebsd.org/changeset/ports/359424 QAT: https://qat.redports.org/buildarchive/r359424/ Log: On some Tier-2 platforms (e.g. PowerPC), clang kind of works and so is installed but is not cc. On such platforms, clang is usually not default for a reason and so using it for C++11 is unwise. Instead, fall back to newer GCC. On i386 and amd64, clang works even if it isn't the default, so continue using it there. This fixes the build for Boost, among other software, on PowerPC. Approved by: bapt Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Thu Jun 26 22:08:49 2014 (r359423) +++ head/Mk/Uses/compiler.mk Thu Jun 26 22:16:37 2014 (r359424) @@ -75,7 +75,9 @@ ALT_COMPILER_VERSION= 0 ALT_COMPILER_TYPE= none _ALTCCVERSION= .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang) +.if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default for a reason _ALTCCVERSION!= /usr/bin/clang --version +.endif .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc) _ALTCCVERSION!= /usr/bin/gcc --version .endif @@ -138,7 +140,7 @@ CHOSEN_COMPILER_TYPE= gcc .if ${_COMPILER_ARGS:Mc++11-lang} .if !${COMPILER_FEATURES:Mc++11} -.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