[gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/

[Michał Górny]

commit:     023069664f237e624cd5658c5364b1aab0d46cc7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 09:02:11 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 09:07:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02306966

sys-devel/clang: Pass runtime headers through header check

 sys-devel/clang/clang-9999.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys-devel/clang/clang-9999.ebuild 
b/sys-devel/clang/clang-9999.ebuild
index a962a81..a4c4aa4 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -207,6 +207,10 @@ src_install() {
 
        multilib-minimal_src_install
 
+       # Move runtime headers to /usr/lib/clang, where they belong
+       dodir /usr/lib
+       mv "${ED}usr/include/clangrt" "${ED}usr/lib/clang" || die
+
        # Apply CHOST and version suffix to clang tools
        local clang_version=4.0
        local clang_tools=( clang clang++ clang-cl clang-cpp )
@@ -247,9 +251,10 @@ src_install() {
 multilib_src_install() {
        cmake-utils_src_install
 
-       # move headers to the correct directory
-       dodir /usr/lib/clang
-       cp -pR "${ED}usr/$(get_libdir)/clang"/* "${ED}usr/lib/clang/" || die
+       # move headers to include/ to get them checked for ABI mismatch
+       # (then to the correct directory in src_install())
+       insinto /usr/include/clangrt
+       doins -r "${ED}usr/$(get_libdir)/clang"/.
        rm -r "${ED}usr/$(get_libdir)/clang" || die
 }