From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7804E139087 for ; Sat, 14 Jan 2017 18:14:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCEB7234048; Sat, 14 Jan 2017 18:14:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A79ED234041 for ; Sat, 14 Jan 2017 18:14:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7198F34108B for ; Sat, 14 Jan 2017 18:14:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5C4D270C for ; Sat, 14 Jan 2017 18:14:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1484417551.e5b63fc32ca82454b18b8687cc08a723431a8c27.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e5b63fc32ca82454b18b8687cc08a723431a8c27 X-VCS-Branch: master Date: Sat, 14 Jan 2017 18:14:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3046acab-fbc5-451c-8b4e-e6c1b4ec32e2 X-Archives-Hash: cab9600b4ba841ee90da61cdfa07850b commit: e5b63fc32ca82454b18b8687cc08a723431a8c27 Author: Michał Górny gentoo org> AuthorDate: Sat Jan 14 14:47:59 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jan 14 18:12:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b63fc3 sys-libs/compiler-rt: Obtain version from llvm-config Obtain the clang version that is used to build paths from llvm-config, instead of hardcoding it in ebuild. This matches the method used in upstream code (obtaining it from CMake files), and works both for release and live ebuilds. It is fine to rely on llvm-config since we need it for LLVM macros anyway. sys-libs/compiler-rt/compiler-rt-9999.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild index 8f44cb9..fd1f907 100644 --- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild @@ -50,7 +50,8 @@ src_configure() { fi fi - local clang_version=4.0.0 + local llvm_version=$(llvm-config --version) || die + local clang_version=$(get_version_component_range 1-3 "${llvm_version}") local libdir=$(get_libdir) local mycmakeargs=( # used to find cmake modules @@ -75,7 +76,8 @@ run_tests_for_abi() { src_test() { # prepare a test compiler - local clang_version=4.0.0 + local llvm_version=$(llvm-config --version) || die + local clang_version=$(get_version_component_range 1-3 "${llvm_version}") # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it