]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
gcc-common.inc: Process staging fixme with correct target/native sysroot
authorNathan Rossi <nathan@nathanrossi.com>
Wed, 28 Aug 2019 05:06:29 +0000 (05:06 +0000)
committerArmin Kuster <akuster808@gmail.com>
Fri, 30 Aug 2019 22:29:47 +0000 (15:29 -0700)
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 <nathan@nathanrossi.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-devtools/gcc/gcc-common.inc

index 96334e54b4bd28a8c7bc3d39acbba398d8f2fc05..a8f4b60c320afb93da342d5cc113b3f76d60316d 100644 (file)
@@ -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):