external-sourcery: ensure the sysroot is available as a variable again

Signed-off-by: Christopher Larson <chris_larson@mentor.com>

conf/distro/include/tcmode-external-sourcery.inc

@@ -63,10 +63,17 @@ python toolchain_metadata_setup () {
     if not isinstance(e, bb.event.ConfigParsed):
         return
 
+    import subprocess
     d = e.data
 
     l = d.createCopy()
     l.finalize()
+
+    sysroot_cmd = "${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} -print-sysroot"
+    toolchain_sysroot = bb.process.run(bb.data.expand(sysroot_cmd, l),
+                                       stderr=subprocess.PIPE)[0].rstrip()
+    d.setVar('EXTERNAL_TOOLCHAIN_SYSROOT', toolchain_sysroot)
+
     if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)):
         d.setVar('TOOLCHAIN_PATH_ADD', '')
 

recipes/meta/external-sourcery-toolchain.bb

@@ -30,7 +30,7 @@ SRC_URI = "file://SUPPORTED"
 
 do_install() {
 	# Use optimized files if available
-	sysroot="$(${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} -print-sysroot)"
+	sysroot="${EXTERNAL_TOOLCHAIN_SYSROOT}"
 
 	cp -a $sysroot${base_libdir}/. ${D}${base_libdir}
 	cp -a $sysroot/etc/. ${D}${sysconfdir}