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>
This commit is contained in:
Khem Raj
2018-01-26 23:06:26 -08:00
committed by Richard Purdie
parent 7ef064e80c
commit e13b6f76c7

View File

@@ -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'