svn commit: r359791 - head/Mk/Uses

Nathan Whitehorn nwhitehorn at FreeBSD.org
Sun Jun 29 20:35:06 UTC 2014


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


More information about the svn-ports-head mailing list