svn commit: r342413 - head/lang/libobjc2
Baptiste Daroussin
bapt at FreeBSD.org
Mon Feb 3 10:34:09 UTC 2014
Author: bapt
Date: Mon Feb 3 10:34:08 2014
New Revision: 342413
URL: http://svnweb.freebsd.org/changeset/ports/342413
QAT: https://qat.redports.org/buildarchive/r342413/
Log:
Use regular CC and CXX instead of custom CLANGXX/CLANG
That fixes build after .pre.mk removal as well as simplify the makefile
Reported by: tijl
Modified:
head/lang/libobjc2/Makefile
Modified: head/lang/libobjc2/Makefile
==============================================================================
--- head/lang/libobjc2/Makefile Mon Feb 3 10:18:19 2014 (r342412)
+++ head/lang/libobjc2/Makefile Mon Feb 3 10:34:08 2014 (r342413)
@@ -22,11 +22,11 @@ _CLANG!= if [ -f /usr/bin/clang ] ; then
.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...
More information about the svn-ports-all
mailing list