be explicit about which llvm-config(1) to use, there could be more than one

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Feb 23 00:27:50 2016 +0100
Changeset:	6fcb3c85a7de3613a4cefb0461f4729981a6b78b

Modified Files:
	clang-git/Makefile.common
	clang-static-analyzer-git/Makefile
	clang/Makefile.common
	llvm-git/buildlink3.mk
	llvm/buildlink3.mk

Log Message:
be explicit about which llvm-config(1) to use, there could be more than one

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6fcb3c85a7de3613a4cefb0461f4729981a6b78b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clang-git/Makefile.common          | 1 +
 clang-static-analyzer-git/Makefile | 2 +-
 clang/Makefile.common              | 1 +
 llvm-git/buildlink3.mk             | 2 ++
 llvm/buildlink3.mk                 | 2 ++
 5 files changed, 7 insertions(+), 1 deletion(-)

diffs:
diff --git a/clang-git/Makefile.common b/clang-git/Makefile.common
index 98ae472..4302fae 100644
--- a/clang-git/Makefile.common
+++ b/clang-git/Makefile.common
@@ -20,6 +20,7 @@ USE_LANGUAGES=		c c++
 USE_CMAKE+=		yes
 GCC_REQD+=		4.8
 
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
diff --git a/clang-static-analyzer-git/Makefile b/clang-static-analyzer-git/Makefile
index 0ae5f1e..a6045a0 100644
--- a/clang-static-analyzer-git/Makefile
+++ b/clang-static-analyzer-git/Makefile
@@ -3,7 +3,7 @@
 PKGNAME=	clang-static-analyzer-3.9.0
 #PKGNAME=	${DISTNAME:S/clang/clang-static-analyzer/}
 
-DEPENDS+=	clang>=${PKGVERSION_NOREV}:../../wip/clang-git
+DEPENDS+=	clang-${PKGVERSION_NOREV}{,nb*}:../../wip/clang-git
 
 USE_TOOLS+=	perl:run
 
diff --git a/clang/Makefile.common b/clang/Makefile.common
index c4b73ef..93cce09 100644
--- a/clang/Makefile.common
+++ b/clang/Makefile.common
@@ -20,6 +20,7 @@ USE_LANGUAGES=		c c++
 USE_CMAKE+=		yes
 GCC_REQD+=		4.8
 
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=gcc
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=g++
diff --git a/llvm-git/buildlink3.mk b/llvm-git/buildlink3.mk
index 6e03cc9..d9550c4 100644
--- a/llvm-git/buildlink3.mk
+++ b/llvm-git/buildlink3.mk
@@ -8,6 +8,8 @@ LLVM_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.llvm+=	llvm>=3.9.0
 BUILDLINK_PKGSRCDIR.llvm?=	../../wip/llvm-git
 
+LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
+
 .include "../../devel/zlib/buildlink3.mk"
 .endif	# LLVM_BUILDLINK3_MK
 
diff --git a/llvm/buildlink3.mk b/llvm/buildlink3.mk
index 8eaf9de..2adde74 100644
--- a/llvm/buildlink3.mk
+++ b/llvm/buildlink3.mk
@@ -8,6 +8,8 @@ LLVM_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.llvm+=	llvm>=3.8.0rc1
 BUILDLINK_PKGSRCDIR.llvm?=	../../wip/llvm
 
+LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
+
 .include "../../devel/zlib/buildlink3.mk"
 .endif	# LLVM_BUILDLINK3_MK