cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update USES=compiler:c++14-lang to Clang 6.0 on FreeBSD 10

Browse Source 
PR:		227679
Exp-run by:	antoine (only 10.4)
This commit is contained in:
Jan Beich 2018-04-27 23:14:32 +00:00
parent 46fd94ead2
commit 5e1285aafa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=468505
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Mk/Uses/compiler.mk
View File

@ -180,10 +180,10 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang50:devel/llvm50
CPP= ${LOCALBASE}/bin/clang-cpp50
CC= ${LOCALBASE}/bin/clang50
CXX= ${LOCALBASE}/bin/clang++50
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60
CPP= ${LOCALBASE}/bin/clang-cpp60
CC= ${LOCALBASE}/bin/clang60
CXX= ${LOCALBASE}/bin/clang++60
CHOSEN_COMPILER_TYPE= clang
.endif
.endif
@ -202,10 +202,10 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang50:devel/llvm50
CPP= ${LOCALBASE}/bin/clang-cpp50
CC= ${LOCALBASE}/bin/clang50
CXX= ${LOCALBASE}/bin/clang++50
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60
CPP= ${LOCALBASE}/bin/clang-cpp60
CC= ${LOCALBASE}/bin/clang60
CXX= ${LOCALBASE}/bin/clang++60
CHOSEN_COMPILER_TYPE= clang
.endif
.endif
@ -224,11 +224,11 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang50:devel/llvm50
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60
CHOSEN_COMPILER_TYPE= clang
CPP= ${LOCALBASE}/bin/clang-cpp50
CC= ${LOCALBASE}/bin/clang50
CXX= ${LOCALBASE}/bin/clang++50
CPP= ${LOCALBASE}/bin/clang-cpp60
CC= ${LOCALBASE}/bin/clang60
CXX= ${LOCALBASE}/bin/clang++60
.endif
.endif
.endif
@ -246,11 +246,11 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang50:devel/llvm50
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60
CHOSEN_COMPILER_TYPE= clang
CPP= ${LOCALBASE}/bin/clang-cpp50
CC= ${LOCALBASE}/bin/clang50
CXX= ${LOCALBASE}/bin/clang++50
CPP= ${LOCALBASE}/bin/clang-cpp60
CC= ${LOCALBASE}/bin/clang60
CXX= ${LOCALBASE}/bin/clang++60
.endif
.endif
.endif

4
devel/godot/Makefile
View File

@ -24,8 +24,8 @@ RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \
USE_GITHUB= yes
GH_ACCOUNT= godotengine
# on 10.4 using clang34 fails - so we want to use clang50
# gl already needs clang50 so this shouldn't add any overhead
# on 10.4 using clang34 fails - so we want to use clang60
# gl already needs clang60 so this shouldn't add any overhead
USES= compiler:c++14-lang pkgconfig scons ssl
USE_XORG= x11 xcursor xi xinerama xrandr
USE_GL= gl glew glu