1 files changed, 7 insertions, 18 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index a540fb2434..80b85fb054 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -2,8 +2,7 @@ inherit cross
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXTRADEPENDS = ""
-DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS = "virtual/cross-binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
 python () {
     if d.getVar("TARGET_OS").startswith("linux"):
         d.setVar("EXTRADEPENDS", "linux-libc-headers")
@@ -34,16 +33,17 @@ EXTRA_OECONF += "\
 EXTRA_OECONF:append:libc-baremetal = " --without-headers"
 EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix"
 EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix"
+EXTRA_OECONF:remove:libc-picolibc = "--enable-threads=posix"
 
 EXTRA_OECONF_PATHS = "\
     --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
+    --with-gxx-libcxx-include-dir=/not/exist${target_includedir}/c++/v1 \
     --with-sysroot=/not/exist \
     --with-build-sysroot=${STAGING_DIR_TARGET} \
 "
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
 
-
 do_configure:prepend () {
         install -d ${RECIPE_SYSROOT}${target_includedir}
         touch ${RECIPE_SYSROOT}${target_includedir}/limits.h
@@ -61,19 +61,8 @@ do_compile () {
         export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
         export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
 
-        # Prevent native/host sysroot path from being used in configargs.h header,
-        # as it will be rewritten when used by other sysroots preventing support
-        # for gcc plugins
-        oe_runmake configure-gcc
-        sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h
-        sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h
-
-        # Prevent sysroot/workdir paths from being used in checksum-options.
-        # checksum-options is used to generate a checksum which is embedded into
-        # the output binary.
-        oe_runmake TARGET-gcc=checksum-options all-gcc
-        sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
-        sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options
+        remove_sysroot_paths_from_configargs '/host'
+        remove_sysroot_paths_from_checksum_options '${STAGING_DIR_HOST}' '/host'
 
         oe_runmake all-host configure-target-libgcc
         (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
@@ -104,7 +93,7 @@ do_install () {
         # found. These need to be relative paths so they work in different locations.
         dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
         install -d $dest
-        for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip gcc cpp $fortsymlinks; do
+        for t in ar as ld ld.bfd nm objcopy objdump ranlib strip gcc cpp $fortsymlinks; do
                 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
                 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
         done
@@ -119,7 +108,7 @@ do_install () {
         cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
         cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
 
-        find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
+        cleanup_installed_include_fixed
 
         # install LTO linker plugins where binutils tools can find it
         install -d ${D}${libdir}/bfd-plugins