[gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/

[Michał Górny]

commit:     e5b63fc32ca82454b18b8687cc08a723431a8c27
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 14:47:59 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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