Browse Source

tcmode: fix setup_external_vars

This was failing to set the variables needed.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Christopher Larson 3 years ago
parent
commit
c6be292f36
1 changed files with 5 additions and 5 deletions
  1. 5 5
      conf/distro/include/tcmode-external-oe-sdk.inc

+ 5 - 5
conf/distro/include/tcmode-external-oe-sdk.inc

@@ -20,7 +20,7 @@ python extract_env_setup_metadata() {
 
     external_toolchain = Path(d.getVar('EXTERNAL_TOOLCHAIN'))
     if external_toolchain.is_absolute() and external_toolchain.is_dir():
-        setup_external_vars(external_toolchain, d)
+        setup_external_vars(external_toolchain, d, d)
 
         localdata = bb.data.createCopy(d)
         variants = d.getVar('MULTILIB_VARIANTS') or ''
@@ -29,17 +29,17 @@ python extract_env_setup_metadata() {
             overrides = d.getVar('OVERRIDES', False) + ':virtclass-multilib-' + item
             localdata.setVar('OVERRIDES', overrides)
             localdata.setVar('MLPREFIX', item + '-')
-            setup_external_vars(external_toolchain, localdata)
+            setup_external_vars(external_toolchain, localdata, d)
 }
 extract_env_setup_metadata[eventmask] = "bb.event.ConfigParsed"
 addhandler extract_env_setup_metadata
 
-def setup_external_vars(external_toolchain, d):
+def setup_external_vars(external_toolchain, localdata, d):
     from pathlib import Path
 
-    setup, env = get_setup_script_env(external_toolchain, d)
+    setup, env = get_setup_script_env(external_toolchain, localdata)
 
-    mlprefix = d.getVar('MLPREFIX')
+    mlprefix = localdata.getVar('MLPREFIX')
     if mlprefix:
         suffix = '_virtclass-multilib-' + mlprefix[:-1]
     else: