Date: Thu, 26 Jun 2014 22:16:38 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359424 - head/Mk/Uses Message-ID: <201406262216.s5QMGcd8049387@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406262216.s5QMGcd8049387>