@@ -4,8 +4,8 @@
# - Buildroot's 'target' is Meson's 'host'
[binaries]
-c = '@TARGET_CROSS@gcc'
-cpp = '@TARGET_CROSS@g++'
+c = '@TARGET_CC@'
+cpp = '@TARGET_CXX@'
ar = '@TARGET_CROSS@ar'
strip = '@TARGET_CROSS@strip'
pkgconfig = '@HOST_DIR@/usr/bin/pkg-config'
@@ -55,6 +55,8 @@ HOST_MESON_SED_CXXFLAGS = $(if $(strip $(TARGET_CXXFLAGS)),`printf '"%s"$(comma)
define HOST_MESON_INSTALL_CROSS_CONF
mkdir -p $(HOST_DIR)/etc/meson
sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
+ -e "s%@TARGET_CC@%$(TARGET_CC)%g" \
+ -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \
-e "s%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
-e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
-e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
@@ -72,6 +72,8 @@ define $(2)_CONFIGURE_CMDS
rm -rf $$($$(PKG)_SRCDIR)/build
mkdir -p $$($$(PKG)_SRCDIR)/build
sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
+ -e "s%@TARGET_CC@%$$(TARGET_CC)%g" \
+ -e "s%@TARGET_CXX@%$$(TARGET_CXX)%g" \
-e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
-e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
-e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
Using TARGET_CROSS expect using GCC compiler, instead use TARGET_CC and TARGET_CXX for the case where Clang is used as cross-compiler. Signed-off-by: Romain Naour <romain.naour@smile.fr> Cc: Matt Weber <matthew.weber@rockwellcollins.com> Cc: Valentin Korenblit <valentinkorenblit@gmail.com> --- v2: fix pkg-meson (missing $) and keep TARGET_CROSS in sed command for other tools (as etc). --- package/meson/cross-compilation.conf.in | 4 ++-- package/meson/meson.mk | 2 ++ package/pkg-meson.mk | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-)