From 217f6de2127294c9a1af226d10f56dc0ef78892d Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 16 Oct 2020 01:31:57 +0500 Subject: [PATCH] libgcc-external: fix the resolved relative path This was using the relpath between the sysroot and the libroot, but only resolved one of the two, which would result in a wildly incorrect relative path, breaking the build in some contexts. JIRA: SB-15645 Signed-off-by: Christopher Larson --- recipes-external/gcc/libgcc-external.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-external/gcc/libgcc-external.bb b/recipes-external/gcc/libgcc-external.bb index 23959cb..2bc1746 100644 --- a/recipes-external/gcc/libgcc-external.bb +++ b/recipes-external/gcc/libgcc-external.bb @@ -19,7 +19,7 @@ INSANE_SKIP_${PN} += "build-deps file-rdeps" # on the target, moreover linker won't be able to find them there (see original libgcc.bb recipe). BINV = "${GCC_VERSION}" FILES_${PN} = "${base_libdir}/libgcc_s.so.*" -LIBROOT_RELATIVE_RESOLVED = "${@os.path.relpath(os.path.realpath('${EXTERNAL_TOOLCHAIN_LIBROOT}'), '${EXTERNAL_TOOLCHAIN_SYSROOT}')}" +LIBROOT_RELATIVE_RESOLVED = "${@os.path.relpath(os.path.realpath('${EXTERNAL_TOOLCHAIN_LIBROOT}'), os.path.realpath('${EXTERNAL_TOOLCHAIN_SYSROOT}'))}" LIBROOT_RELATIVE = "${@os.path.relpath('${EXTERNAL_TOOLCHAIN_LIBROOT}', '${EXTERNAL_TOOLCHAIN_SYSROOT}')}" FILES_${PN}-dev = "${base_libdir}/libgcc_s.so \ /${LIBROOT_RELATIVE_RESOLVED} \