sys-libs/libcxx: Use CMake files from native LLVM build

diff --git a/sys-libs/libcxx/libcxx-3.9.0.ebuild b/sys-libs/libcxx/libcxx-3.9.0.ebuild
index 25e0b69355e1192528529f7982d99bdca78490d2..d466c0f398aa652ab127d75d2f705b46eb56131b 100644 (file)
--- a/sys-libs/libcxx/libcxx-3.9.0.ebuild
+++ b/sys-libs/libcxx/libcxx-3.9.0.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
        test? ( sys-devel/clang[${MULTILIB_USEDEP}]
                ${PYTHON_DEPS} )
        app-arch/xz-utils
-       >=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]"
+       >=sys-devel/llvm-3.9.0"
 
 DOCS=( CREDITS.TXT )
 
@@ -94,6 +94,11 @@ src_unpack() {
        git-r3_checkout
 }
 
+src_configure() {
+       NATIVE_LIBDIR=$(get_libdir)
+       cmake-multilib_src_configure
+}
+
 multilib_src_configure() {
        local cxxabi cxxabi_incs
        if use libcxxrt; then
@@ -107,7 +112,10 @@ multilib_src_configure() {
 
        local libdir=$(get_libdir)
        local mycmakeargs=(
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+               # LLVM_LIBDIR_SUFFIX is used to find CMake files
+               # and we are happy to use the native set
+               -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
+               -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBCXX_ENABLE_SHARED=ON
                -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
                -DLIBCXX_CXX_ABI=${cxxabi}

diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index dc867aa6bd427c446d215ec4e0c6e78c2eb767b3..7f444c79833cc7c70f6811b593fc7aafa216f9a3 100644 (file)
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
        test? ( sys-devel/clang[${MULTILIB_USEDEP}]
                ${PYTHON_DEPS} )
        app-arch/xz-utils
-       >=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]"
+       >=sys-devel/llvm-3.9.0"
 
 DOCS=( CREDITS.TXT )
 
@@ -90,6 +90,11 @@ src_unpack() {
        git-r3_checkout
 }
 
+src_configure() {
+       NATIVE_LIBDIR=$(get_libdir)
+       cmake-multilib_src_configure
+}
+
 multilib_src_configure() {
        local cxxabi cxxabi_incs
        if use libcxxrt; then
@@ -103,7 +108,10 @@ multilib_src_configure() {
 
        local libdir=$(get_libdir)
        local mycmakeargs=(
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+               # LLVM_LIBDIR_SUFFIX is used to find CMake files
+               # and we are happy to use the native set
+               -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
+               -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBCXX_ENABLE_SHARED=ON
                -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
                -DLIBCXX_CXX_ABI=${cxxabi}