diff --git a/meta-ohos-staging/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta-ohos-staging/recipes-devtools/gcc/gcc-cross-canadian.inc index 1872faee1b08cf252721f4d30e127824f553d41e..eaf4f57ef15e8eba070122681261f3dabd364d01 100644 --- a/meta-ohos-staging/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta-ohos-staging/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -139,6 +139,9 @@ 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/ + # Fix a plugin header including a nonexistant (and unnecessary) header + sed -i -e '/config\/i386\/linux64\.h/d' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h + # install LTO linker plugins where binutils tools can find it install -d ${D}${libdir}/bfd-plugins ln -sf ${LIBRELPATH}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so diff --git a/meta-ohos-staging/recipes-devtools/gcc/gcc-cross.inc b/meta-ohos-staging/recipes-devtools/gcc/gcc-cross.inc index dca4036ab5f8ee63ba1dca580b3a8f60e0af76b5..348bd1df18803448101c9a6c9d730f529ea4da12 100644 --- a/meta-ohos-staging/recipes-devtools/gcc/gcc-cross.inc +++ b/meta-ohos-staging/recipes-devtools/gcc/gcc-cross.inc @@ -119,6 +119,9 @@ 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/ + # Fix a plugin header including a nonexistant (and unnecessary) header + sed -i -e '/config\/i386\/linux64\.h/d' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h + 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 # install LTO linker plugins where binutils tools can find it diff --git a/meta-ohos-staging/recipes-devtools/gcc/gcc-target.inc b/meta-ohos-staging/recipes-devtools/gcc/gcc-target.inc index 0ee3e83d42d2384ae1a5d1ebd44562ca99668ad8..48dfd9cef52e0109c152150a81dcdd50ca88db25 100644 --- a/meta-ohos-staging/recipes-devtools/gcc/gcc-target.inc +++ b/meta-ohos-staging/recipes-devtools/gcc/gcc-target.inc @@ -186,6 +186,8 @@ do_install () { # Don't package details about the build host rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h + # Fix a plugin header including a nonexistant (and unnecessary) header + sed -i -e '/config\/i386\/linux64\.h/d' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/tm.h cd ${D}${bindir}