gcc-runtime: avoid passing MULTIBUILDTOP to libatomic

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 <Hemanth.KumarMD@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 30b2832c82f5f25050f923bf4496f91af7341179..e305180c64f402a9c35f6c81a802eeaa701bec37 100644 (file)
--- 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}