diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2018-01-26 23:06:26 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-29 08:49:50 +0000 |
| commit | e13b6f76c70ea7362f2f18371a7d1a47efe34454 (patch) | |
| tree | 4327ca629ebe8aeed468165d3e89d7af8c8cf5eb /meta/classes/meson.bbclass | |
| parent | 7ef064e80ccd6f7cf8df58e836d244e910c99270 (diff) | |
| download | openembedded-core-contrib-e13b6f76c70ea7362f2f18371a7d1a47efe34454.tar.gz | |
meson: Adjust for clang compiler
Remove hardcoding c/c++ compiler to be gcc alone, its
possible to use clang as replacement for cross compilers
from meta-clang, therefore set clang/clang++ if
TOOLCHAIN = "clang"
(From OE-Core rev: 05789489d25a5ceac0403613ad789d78198be6ee)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/meson.bbclass')
| -rw-r--r-- | meta/classes/meson.bbclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 91ac652651..cd3497a802 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -40,6 +40,11 @@ EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}" MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--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(("'", "'")) @@ -49,8 +54,8 @@ 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}gcc' -cpp = '${HOST_PREFIX}g++' +c = '${HOST_PREFIX}${CCOMPILER}' +cpp = '${HOST_PREFIX}${CXXCOMPILER}' ar = '${HOST_PREFIX}ar' ld = '${HOST_PREFIX}ld' strip = '${HOST_PREFIX}strip' |