diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-01-15 15:14:04 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-01-15 15:31:01 +0100 |
| commit | 7384151ea7963b2314524e6f92a122fcf7bf27f4 (patch) | |
| tree | 3d6c6bdce98698c566320aa1859b211c83661f0d /sys-libs/libcxx | |
| parent | sys-libs/libcxxabi: Remove unnecessary LLVM_LIBDIR_SUFFIX (diff) | |
| download | gentoo-7384151ea7963b2314524e6f92a122fcf7bf27f4.tar.gz gentoo-7384151ea7963b2314524e6f92a122fcf7bf27f4.tar.bz2 gentoo-7384151ea7963b2314524e6f92a122fcf7bf27f4.zip | |
sys-libs/libcxx: Remove unnecessary LLVM_LIBDIR_SUFFIX
Diffstat (limited to 'sys-libs/libcxx')
| -rw-r--r-- | sys-libs/libcxx/libcxx-9999.ebuild | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild index a5f89acfb5aa..c9030c1abd6b 100644 --- a/sys-libs/libcxx/libcxx-9999.ebuild +++ b/sys-libs/libcxx/libcxx-9999.ebuild @@ -41,15 +41,14 @@ RDEPEND=" libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )" -# llvm-3.9.0 needed because its cmake files installation path changed, which is -# needed by libcxx +# LLVM 4 required for llvm-config --cmakedir # clang-3.9.0 installs necessary target symlinks unconditionally # which removes the need for MULTILIB_USEDEP DEPEND="${RDEPEND} test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') ) app-arch/xz-utils - >=sys-devel/llvm-3.9.0" + >=sys-devel/llvm-4" DOCS=( CREDITS.TXT ) @@ -83,11 +82,6 @@ pkg_setup() { fi } -src_configure() { - NATIVE_LIBDIR=$(get_libdir) - cmake-multilib_src_configure -} - multilib_src_configure() { local cxxabi cxxabi_incs if use libcxxabi; then @@ -126,9 +120,6 @@ multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - # 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) |