[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     51f9736209cc2077ba957becf2523f22329d5aa7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 20:49:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 20:49:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=51f97362

sys-devel/gcc-10.1.0-r1: next attempt at linkage on Big Sur

Bug: https://bugs.gentoo.org/756160
Package-Manager: Portage-3.0.10-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/gcc/gcc-10.1.0-r1.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
index 99d7996d72..e4e696251a 100644
--- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild
@@ -50,11 +50,6 @@ src_prepare() {
 	find .  -name "configure" | xargs \
 	sed -i -e '/^\s*10\.\*)/N' \
 		-e '/^\s*10\.\*)\s*_lt_dar_allow_undefined/s/10\.\*/10.*|11.*/' || die
-	if [[ ${CHOST} == *-darwin20 ]] ; then
-		# drop -lc, it isn't there (any more?)
-		sed -i -e '/^SHLIB_LC =/s/=.*$/=/' \
-			libgcc/config/t-slibgcc-darwin || die
-	fi
 
 	# fix complaint about Authorization Framework
 	eapply -p1 "${FILESDIR}"/${PN}-10.1.0-darwin-auth-fixincludes.patch
@@ -80,6 +75,10 @@ src_configure() {
 			export gcc_cv_c_no_fpie=no
 			export gcc_cv_no_pie=no
 		;;
+		*-darwin20)
+			# use sysroot with the linker, #756160
+			export gcc_cv_ld_sysroot=yes
+			;;
 		*-solaris*)
 			# todo: some magic for native vs. GNU linking?
 			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )