Date: Sat, 12 Nov 2016 17:42:52 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425969 - head/Mk/Uses Message-ID: <201611121742.uACHgq2U036533@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Nov 12 17:42:52 2016 New Revision: 425969 URL: https://svnweb.freebsd.org/changeset/ports/425969 Log: All supported versions of FreeBSD that install clang have version 3.4.1 or newer, so remove obsolete checks in compiler.mk and objc.mk Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D8496 Modified: head/Mk/Uses/compiler.mk head/Mk/Uses/objc.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Sat Nov 12 17:38:26 2016 (r425968) +++ head/Mk/Uses/compiler.mk Sat Nov 12 17:42:52 2016 (r425969) @@ -176,8 +176,8 @@ CHOSEN_COMPILER_TYPE= clang .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} < 34) || ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 +.elif ${COMPILER_TYPE} == gcc +.if ${ALT_COMPILER_TYPE} == clang CPP= clang-cpp CC= clang CXX= clang++ @@ -198,8 +198,8 @@ CHOSEN_COMPILER_TYPE= clang .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} < 34) || ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 +.elif ${COMPILER_TYPE} == gcc +.if ${ALT_COMPILER_TYPE} == clang CPP= clang-cpp CC= clang CXX= clang++ @@ -220,8 +220,8 @@ CXX= ${LOCALBASE}/bin/clang++34 .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} < 34) || ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 +.elif ${COMPILER_TYPE} == gcc +.if ${ALT_COMPILER_TYPE} == clang CPP= clang-cpp CC= clang CXX= clang++ Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Sat Nov 12 17:38:26 2016 (r425968) +++ head/Mk/Uses/objc.mk Sat Nov 12 17:42:52 2016 (r425969) @@ -48,8 +48,8 @@ ALT_COMPILER_TYPE= gcc .endif # We do always need clang -.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34) || ${COMPILER_TYPE} != clang -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 +.if ${COMPILER_TYPE} != clang +.if ${ALT_COMPILER_TYPE} == clang CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611121742.uACHgq2U036533>