diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2016-11-13 01:42:52 +0800 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2016-11-13 01:42:52 +0800 |
| commit | 89ba71e63f6ac28d7f42a5e761ce276e01d86fe9 (patch) | |
| tree | d1f1565543b35facd6ce85c6dabe9528f36ae0cc /Mk | |
| parent | 3e9f8351e914562c6010bd85ac1c07708a161053 (diff) | |
| download | freebsd-ports-gnome-89ba71e63f6ac28d7f42a5e761ce276e01d86fe9.tar.gz freebsd-ports-gnome-89ba71e63f6ac28d7f42a5e761ce276e01d86fe9.tar.zst freebsd-ports-gnome-89ba71e63f6ac28d7f42a5e761ce276e01d86fe9.zip | |
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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/compiler.mk | 12 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 8905d7714982..94bf2eee52e9 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -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++ diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index e27057f5d268..9934c92742a3 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -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++ |