--- /usr/local/gentoo/usr/portage/sys-devel/llvm/llvm-3.5.0.ebuild 2015-01-01 22:01:42.000000000 +0100 +++ llvm-3.5.0.ebuild 2015-01-15 09:14:47.000000000 +0100 @@ -438,7 +438,8 @@ if [[ ${CHOST} == *-darwin* ]] ; then eval $(grep PACKAGE_VERSION= configure) [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION} - for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do + [[ -n ${libpv} ]] && libpvmajor=${libpv%%.[0-9]*} + for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do # libEnhancedDisassembly is Darwin10 only, so non-fatal # + omit clang libs if not enabled [[ -f ${ED}/usr/lib/${lib} ]] || continue @@ -451,7 +452,7 @@ done for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do # omit clang libs if not enabled - [[ -f ${ED}/usr/lib/${lib} ]] || continue + [[ -f ${ED}/usr/lib/${f} ]] || continue scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \ while read odylib ; do @@ -463,6 +464,9 @@ */libLLVM-${libpv}.dylib) ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib ;; + */libLLVM-${libpvmajor}.dylib) + ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvmajor}.dylib + ;; */libLTO.dylib) ndylib="${EPREFIX}"/usr/lib/libLTO.dylib ;;