From: Nathan Rossi Date: Wed, 28 Aug 2019 05:06:29 +0000 (+0000) Subject: gcc-common.inc: Process staging fixme with correct target/native sysroot X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d75e9e49cfaeaefe1bd24f66c1aa96fc2cb470ab;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gcc-common.inc: Process staging fixme with correct target/native sysroot Correct the 'staging_processfixme' call so that target sysroot and native sysroot paths are corrected when extracting the stashed build directory. This is required for 'make check' to work correctly due paths used in configuration and scripts which point at the native sysroot. Signed-off-by: Nathan Rossi Signed-off-by: Armin Kuster --- diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 96334e54b4b..a8f4b60c320 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -17,7 +17,7 @@ python extract_stashed_builddir () { src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") dest = d.getVar("B") oe.path.copyhardlinktree(src, dest) - staging_processfixme([src + "/fixmepath"], dest, dest, dest, d) + staging_processfixme([src + "/fixmepath"], dest, d.getVar("RECIPE_SYSROOT"), d.getVar("RECIPE_SYSROOT_NATIVE"), d) } def get_gcc_float_setting(bb, d):