diff options
Diffstat (limited to 'meta/classes')
-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 = "" | |||
41 | MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" | 41 | MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" |
42 | MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" | 42 | MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" |
43 | 43 | ||
44 | CCOMPILER ?= "gcc" | ||
45 | CXXCOMPILER ?= "g++" | ||
46 | CCOMPILER_toolchain-clang = "clang" | ||
47 | CXXCOMPILER_toolchain-clang = "clang++" | ||
48 | |||
49 | def meson_array(var, d): | 44 | def meson_array(var, d): |
50 | return "', '".join(d.getVar(var).split()).join(("'", "'")) | 45 | return "', '".join(d.getVar(var).split()).join(("'", "'")) |
51 | 46 | ||
52 | addtask write_config before do_configure | 47 | addtask write_config before do_configure |
53 | do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS" | 48 | do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF" |
54 | do_write_config() { | 49 | do_write_config() { |
55 | # This needs to be Py to split the args into single-element lists | 50 | # This needs to be Py to split the args into single-element lists |
56 | cat >${WORKDIR}/meson.cross <<EOF | 51 | cat >${WORKDIR}/meson.cross <<EOF |
57 | [binaries] | 52 | [binaries] |
58 | c = '${HOST_PREFIX}${CCOMPILER}' | 53 | c = [${@meson_array('CC', d)}] |
59 | cpp = '${HOST_PREFIX}${CXXCOMPILER}' | 54 | cpp = [${@meson_array('CXX', d)}] |
60 | ar = '${HOST_PREFIX}ar' | 55 | ar = [${@meson_array('AR', d)}] |
61 | ld = '${HOST_PREFIX}ld' | 56 | nm = [${@meson_array('NM', d)}] |
62 | strip = '${HOST_PREFIX}strip' | 57 | ld = [${@meson_array('LD', d)}] |
63 | readelf = '${HOST_PREFIX}readelf' | 58 | strip = [${@meson_array('STRIP', d)}] |
59 | readelf = [${@meson_array('READELF', d)}] | ||
64 | pkgconfig = 'pkg-config' | 60 | pkgconfig = 'pkg-config' |
65 | 61 | ||
66 | [properties] | 62 | [properties] |