diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/meson.bbclass | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 31d32a56f6..2d7ee4fffc 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -41,26 +41,22 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -CCOMPILER ?= "gcc" -CXXCOMPILER ?= "g++" -CCOMPILER_toolchain-clang = "clang" -CXXCOMPILER_toolchain-clang = "clang++" - def meson_array(var, d): return "', '".join(d.getVar(var).split()).join(("'", "'")) addtask write_config before do_configure -do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS" +do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF" do_write_config() { # This needs to be Py to split the args into single-element lists cat >${WORKDIR}/meson.cross <<EOF [binaries] -c = '${HOST_PREFIX}${CCOMPILER}' -cpp = '${HOST_PREFIX}${CXXCOMPILER}' -ar = '${HOST_PREFIX}ar' -ld = '${HOST_PREFIX}ld' -strip = '${HOST_PREFIX}strip' -readelf = '${HOST_PREFIX}readelf' +c = [${@meson_array('CC', d)}] +cpp = [${@meson_array('CXX', d)}] +ar = [${@meson_array('AR', d)}] +nm = [${@meson_array('NM', d)}] +ld = [${@meson_array('LD', d)}] +strip = [${@meson_array('STRIP', d)}] +readelf = [${@meson_array('READELF', d)}] pkgconfig = 'pkg-config' [properties] |