svn commit: r498337 - branches/2019Q2/devel/ccls
Tobias Kortkamp
tobik at FreeBSD.org
Mon Apr 8 00:38:30 UTC 2019
Author: tobik
Date: Mon Apr 8 00:38:29 2019
New Revision: 498337
URL: https://svnweb.freebsd.org/changeset/ports/498337
Log:
MFH: r498336
devel/ccls: Fix build with multiple llvm* packages installed
Apparently it is possible for the build to pick multiple LLVM
versions if LLVM_DIR is not explicitly set similar to Clang_DIR.
$ grep llvm $(make -V CONFIGURE_WRKSRC)/CMakeCache.txt
Clang_DIR:PATH=/usr/local/llvm80/lib/cmake/clang
LLVM_DIR:PATH=/usr/local/llvm50/lib/cmake/llvm
PR: 237089
Submitted by: fullermd at over-yonder.net
Approved by: ports-secteam blanket
Modified:
branches/2019Q2/devel/ccls/Makefile
Directory Properties:
branches/2019Q2/ (props changed)
Modified: branches/2019Q2/devel/ccls/Makefile
==============================================================================
--- branches/2019Q2/devel/ccls/Makefile Mon Apr 8 00:37:46 2019 (r498336)
+++ branches/2019Q2/devel/ccls/Makefile Mon Apr 8 00:38:29 2019 (r498337)
@@ -21,7 +21,8 @@ GH_ACCOUNT= MaskRay
# Commit matching 0.20190314
#GH_TAGNAME= 1976fec59559b7d2a88b5dcd7631e089eaa194fc
-CMAKE_ARGS= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang"
+CMAKE_ARGS= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \
+ -DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm"
CXXFLAGS+= -DNDEBUG
PLIST_FILES= bin/ccls
More information about the svn-ports-all
mailing list