From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 15 Dec 2016 20:33:39 +0000 (+0100)
Subject: sys-libs/compiler-rt-sanitizers: Include LLVMgold in test compiler
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=eb11add08ee863d43c405f3b640e1c27ff404d50;p=gentoo.git

sys-libs/compiler-rt-sanitizers: Include LLVMgold in test compiler

Symlink the LLVMgold.so plugin in the test compiler tree since some of
the tests use LTO support if available, and clang uses plugin path
relative to the executable.
---

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 77170a8cbca5..10ad41306023 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -92,13 +92,18 @@ src_configure() {
 
 		# copy clang over since resource_dir is located relatively to binary
 		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/{bin,lib/clang/"${clang_version}"/include} || die
+		mkdir -p "${BUILD_DIR}"/{bin,$(get_libdir),lib/clang/"${clang_version}"/include} || die
 		cp "${EPREFIX}/usr/bin/clang" "${EPREFIX}/usr/bin/clang++" \
 			"${BUILD_DIR}"/bin/ || die
 		cp "${EPREFIX}/usr/lib/clang/${clang_version}/include"/*.h \
 			"${BUILD_DIR}/lib/clang/${clang_version}/include/" || die
 		cp "${sys_dir}"/*builtins*.a \
 			"${BUILD_DIR}/lib/clang/${clang_version}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}/usr/$(get_libdir)/LLVMgold.so" \
+				"${BUILD_DIR}/$(get_libdir)/" || die
+		fi
 	fi
 }