Page MenuHomeFreeBSD
Files F164802638

D8496.id22173.diff
No OneTemporary
Actions

D8496.id22173.diff
View Options

Index: head/Mk/Uses/compiler.mk
===================================================================
--- head/Mk/Uses/compiler.mk
+++ head/Mk/Uses/compiler.mk
@@ -176,8 +176,8 @@
.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 @@
.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 @@
.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++
Index: head/Mk/Uses/objc.mk
===================================================================
--- head/Mk/Uses/objc.mk
+++ head/Mk/Uses/objc.mk
@@ -48,8 +48,8 @@
.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++

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 5, 3:09 AM (8 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35958993
Default Alt Text
D8496.id22173.diff (2 KB)

Event Timeline