commit: cae17298ec9c0d1c84577a026545491a95af2ea8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 18 05:21:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 18 05:21:33 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=cae17298
sys-devel/gcc: add workaround for cross-compile failure Bug: https://bugs.gentoo.org/803371 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/gcc-11.2.0-cross-compile-include.patch | 26 ++++++++++++++++++++++ sys-devel/gcc/gcc-11.2.0.ebuild | 5 +++++ 2 files changed, 31 insertions(+) diff --git a/sys-devel/gcc/files/gcc-11.2.0-cross-compile-include.patch b/sys-devel/gcc/files/gcc-11.2.0-cross-compile-include.patch new file mode 100644 index 00000000..d0641065 --- /dev/null +++ b/sys-devel/gcc/files/gcc-11.2.0-cross-compile-include.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/803371 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80196 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017 +--- a/configure ++++ b/configure +@@ -17044,7 +17044,7 @@ else + fi + + +-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" ++RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ar" >&5 + $as_echo_n "checking where to find the target ar... " >&6; } +--- a/configure.ac ++++ b/configure.ac +@@ -3529,7 +3529,7 @@ ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) + ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) + ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc) + +-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" ++RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++" + + GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar]) + GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new]) + diff --git a/sys-devel/gcc/gcc-11.2.0.ebuild b/sys-devel/gcc/gcc-11.2.0.ebuild index a2abf7bd..84e32720 100644 --- a/sys-devel/gcc/gcc-11.2.0.ebuild +++ b/sys-devel/gcc/gcc-11.2.0.ebuild @@ -15,5 +15,10 @@ BDEPEND="${CATEGORY}/binutils" src_prepare() { toolchain_src_prepare + if is_crosscompile ; then + # bug #803371 + eapply "${FILESDIR}"/gcc-11.2.0-cross-compile-include.patch + fi + eapply_user }
