On Thu, Feb 25, 2021 at 9:37 AM Mike Crowe <[email protected]> wrote: > > In e9e5744ba8b0d43c8b874d365f83071ce20bf0a1, Khem Raj wrote: > > OE does not use the traditional /usr/lib/gcc prefix to store > > gcc-runtime it basically is moved into libdir, however some newer > > files were installed by newer versions of gcc especially libgomp ( > > omp.h openacc.h ) into gcclibdir, so we have content in both > > directories, this confuses other tools which are trying to guess the > > gcc installation and its runtime location, since now we have two > > directories, the tools either choose one or other and we get > > inconsistent behavior, e.g. clang for aarch64 uses /usr/lib but same > > clang for riscv64 chose /usr/lib/gcc > > > This change ensures that OE ends up with single valid location for gcc > > runtime files > > I think that the same thing needs to happen in gcc-sanitizers.inc, > otherwise I get errors like: >
right. Seems a good fix thanks > | .../recipe-sysroot/usr/include/gpg-error-64.h:884:11: fatal error: > sanitizer/lsan_interface.h: No such file or directory > > when attempting to compile with sanitizers enabled. > > Signed-off-by: Mike Crowe <[email protected]> > Cc: Khem Raj <[email protected]> > --- > meta/recipes-devtools/gcc/gcc-sanitizers.inc | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc > b/meta/recipes-devtools/gcc/gcc-sanitizers.inc > index 668e14a59f..67b755edf8 100644 > --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc > +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc > @@ -35,6 +35,11 @@ do_compile () { > do_install () { > cd ${B}/${TARGET_SYS}/libsanitizer/ > oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/ > install > + if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then > + install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include > + mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* > ${D}${libdir}/${TARGET_SYS}/${BINV}/include > + rmdir --ignore-fail-on-non-empty -p > ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include > + fi > if [ -d ${D}${infodir} ]; then > rmdir --ignore-fail-on-non-empty -p ${D}${infodir} > fi > -- > 2.20.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148614): https://lists.openembedded.org/g/openembedded-core/message/148614 Mute This Topic: https://lists.openembedded.org/mt/80907601/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
