diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/uninative.bbclass | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 944fe5cd26..1904508af3 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -374,8 +374,9 @@ python copy_buildsystem () { | |||
374 | 374 | ||
375 | sstate_out = baseoutpath + '/sstate-cache' | 375 | sstate_out = baseoutpath + '/sstate-cache' |
376 | bb.utils.remove(sstate_out, True) | 376 | bb.utils.remove(sstate_out, True) |
377 | # uninative.bbclass sets NATIVELSBSTRING to 'universal' | 377 | |
378 | fixedlsbstring = 'universal' | 378 | # uninative.bbclass sets NATIVELSBSTRING to 'universal%s' % oe.utils.host_gcc_version(d) |
379 | fixedlsbstring = "universal%s" % oe.utils.host_gcc_version(d) | ||
379 | 380 | ||
380 | sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN', True) == '1') | 381 | sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN', True) == '1') |
381 | sdk_ext_type = d.getVar('SDK_EXT_TYPE', True) | 382 | sdk_ext_type = d.getVar('SDK_EXT_TYPE', True) |
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9242320fee..11cbf9be80 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass | |||
@@ -88,7 +88,7 @@ def enable_uninative(d): | |||
88 | loader = d.getVar("UNINATIVE_LOADER", True) | 88 | loader = d.getVar("UNINATIVE_LOADER", True) |
89 | if os.path.exists(loader): | 89 | if os.path.exists(loader): |
90 | bb.debug(2, "Enabling uninative") | 90 | bb.debug(2, "Enabling uninative") |
91 | d.setVar("NATIVELSBSTRING", "universal") | 91 | d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d)) |
92 | d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") | 92 | d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") |
93 | d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:") | 93 | d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:") |
94 | 94 | ||