From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- profiles/features/prefix/standalone/profile.bashrc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'profiles/features') diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index 60a2af632d18..d167e7a9155f 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -15,12 +15,21 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the eend $? done - # use sysroot of toolchain to get currect include and library at compile time + # use sysroot of toolchain to get correct include and library at compile time EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}" ebegin "remove --sysroot call on ld for native toolchain" sed -i 's/--sysroot=%R//' gcc/gcc.c eend $? +elif [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then + ebegin "Use ${EPREFIX} as default sysroot" + sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt + eend $? + pushd "${S}/lib/Driver/ToolChains" >/dev/null + ebegin "Remove --sysroot call on ld for native toolchain" + sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp + eend $? + popd >/dev/null elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then ebegin "Prefixifying native library path" sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ -- cgit v1.2.3