From 23c4307a73d0d7fa1d79c0a95125918cf8a38bc6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 12 Aug 2017 22:51:23 +0200 Subject: [PATCH] dev-libs/libclc: Revert "fix llvm-config path." Revert the non-maintainer commit that reintroduced the cross-slot clang mismatch bug. --- dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild index 003757a0998e..c0ac06980cb4 100644 --- a/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild +++ b/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild @@ -39,9 +39,13 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS}" src_configure() { + # we need to find llvm with matching clang version, so look for + # clang first, and then use llvm-config from the same location + local clang_path=$(type -P clang) || die + ./configure.py \ --with-cxx-compiler="$(tc-getCXX)" \ - --with-llvm-config="$(tc-getPROG LLVM_CONFIG llvm-config)" \ + --with-llvm-config="${clang_path%/*}/llvm-config" \ --prefix="${EPREFIX}/usr" || die } -- 2.26.2