From: Hemanth Kumar M D <[email protected]>

libatomic constructs gcc_objdir using `pwd` and assumes
MULTIBUILDTOP is relative. Passing an absolute MULTIBUILDTOP
from OE results in malformed paths during libtool install
operations in both compile and install stages.

Avoid passing MULTIBUILDTOP for libatomic and use the upstream
default handling instead.

Link: 
https://github.com/gcc-mirror/gcc/commit/e63cf4b130b86dd7dde1bf499d3d40faca10ea2e

Signed-off-by: Hemanth Kumar M D <[email protected]>
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc 
b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 30b2832c82..e305180c64 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -83,14 +83,22 @@ do_configure[depends] += "${COMPILERDEP}"
 do_compile () {
        for d in libgcc ${RUNTIMETARGET}; do
                cd ${B}/${TARGET_SYS}/$d/
-               oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/
+               if [ "$d" = "libatomic" ]; then
+                       oe_runmake
+               else
+                       oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/
+               fi
        done
 }
 
 do_install () {
        for d in ${RUNTIMETARGET}; do
                cd ${B}/${TARGET_SYS}/$d/
-               oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ 
install
+               if [ "$d" = "libatomic" ]; then
+                       oe_runmake 'DESTDIR=${D}' install
+               else
+                       oe_runmake 'DESTDIR=${D}' 
MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ install
+               fi
        done
        install -d ${D}${datadir}/gdb/auto-load/${libdir}
        mv ${D}${libdir}/libstdc++*-gdb.py 
${D}${datadir}/gdb/auto-load/${libdir}
-- 
2.49.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#236614): 
https://lists.openembedded.org/g/openembedded-core/message/236614
Mute This Topic: https://lists.openembedded.org/mt/119201162/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to