kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use regular CC and CXX instead of custom CLANGXX/CLANG

Browse source 
That fixes build after .pre.mk removal as well as simplify the makefile

Reported by:	tijl
This commit is contained in:
Baptiste Daroussin 2014-02-03 10:34:08 +00:00
parent 2c3a7fcb36
commit 57d55e9569
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=342413
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lang/libobjc2/Makefile
View file

@ -22,11 +22,11 @@ _CLANG!= if [ -f /usr/bin/clang ] ; then /usr/bin/clang --version | head -1 | \
.if ${_CLANG} < 33
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
CLANG= ${LOCALBASE}/bin/clang33
CLANGXX= ${LOCALBASE}/bin/clang++33
CC= ${LOCALBASE}/bin/clang33
CXX= ${LOCALBASE}/bin/clang++33
.else
CLANG= /usr/bin/clang
CLANGXX= /usr/bin/clang++
CC= /usr/bin/clang
CXX= /usr/bin/clang++
.endif
SHLIB_MAJOR= 4
@ -42,8 +42,7 @@ PLIST_SUB+= WITH_SEPARATECXX=""
PLIST_SUB+= WITH_SEPARATECXX="@comment "
.endif
CMAKE_ARGS+= -DLIB_INSTALL_PATH=lib -DCMAKE_ASM_COMPILER=${CLANG}
CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CLANG} -DCMAKE_CXX_COMPILER=${CLANGXX}
CMAKE_ARGS+= -DLIB_INSTALL_PATH=lib
CMAKE_ARGS+= -DTESTS=OFF
# This shouldn't be needed, but our llvm port installs llvm-config with a silly
# name...