All of lore.kernel.org
 help / color / mirror / Atom feed
From: Romain Naour <romain.naour@smile.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 06/11] package/meson: use TARGET_{CC, CXX} instead of TARGET_CROSS
Date: Fri,  6 Sep 2019 11:09:42 +0200	[thread overview]
Message-ID: <20190906090947.5476-7-romain.naour@smile.fr> (raw)
In-Reply-To: <20190906090947.5476-1-romain.naour@smile.fr>

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>
---
 package/meson/cross-compilation.conf.in | 4 ++--
 package/meson/meson.mk                  | 3 ++-
 package/pkg-meson.mk                    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/meson/cross-compilation.conf.in b/package/meson/cross-compilation.conf.in
index fc8e27f7eb..86347e9e4e 100644
--- a/package/meson/cross-compilation.conf.in
+++ b/package/meson/cross-compilation.conf.in
@@ -4,8 +4,8 @@
 # - Buildroot's 'target' is Meson's 'host'
 
 [binaries]
-c = '@TARGET_CROSS at gcc'
-cpp = '@TARGET_CROSS at g++'
+c = '@TARGET_CC@'
+cpp = '@TARGET_CXX@'
 ar = '@TARGET_CROSS at ar'
 strip = '@TARGET_CROSS at strip'
 pkgconfig = '@HOST_DIR@/usr/bin/pkg-config'
diff --git a/package/meson/meson.mk b/package/meson/meson.mk
index 3267581fc6..1f836ef070 100644
--- a/package/meson/meson.mk
+++ b/package/meson/meson.mk
@@ -54,7 +54,8 @@ HOST_MESON_SED_CXXFLAGS = $(if $(strip $(TARGET_CXXFLAGS)),`printf '"%s"$(comma)
 # own flags if they need to.
 define HOST_MESON_INSTALL_CROSS_CONF
 	mkdir -p $(HOST_DIR)/etc/meson
-	sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
+	sed -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" \
diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk
index 0b811d1cc0..9821636c28 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -71,7 +71,8 @@ $(2)_MESON_SED_CXXFLAGS = $$(if $$(strip $$($(2)_CXXFLAGS)),`printf '"%s"$$(comm
 define $(2)_CONFIGURE_CMDS
 	rm -rf $$($$(PKG)_SRCDIR)/build
 	mkdir -p $$($$(PKG)_SRCDIR)/build
-	sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
+	sed -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" \
-- 
2.21.0

  parent reply	other threads:[~2019-09-06  9:09 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-06  9:09 [Buildroot] [PATCH 00/11] Add the support for Clang cross-compiler Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 01/11] package/clang: help host-clang to find our external toolchain Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 02/11] package/llvm: add the version major variable Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 03/11] package/clang: " Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 04/11] package/clang: install a toolchain-wrapper for the host clang cross-compiler Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 05/11] linux: override CC for the case CC is not GCC Romain Naour
2019-09-06  9:09 ` Romain Naour [this message]
2019-09-06 15:58   ` [Buildroot] [PATCH 06/11] package/meson: use TARGET_{CC, CXX} instead of TARGET_CROSS Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 07/11] package/busybox: fix applets runtime issue when building with clang cross-compiler Romain Naour
2019-09-07  3:11   ` Matthew Weber
2019-09-07  3:17     ` Matthew Weber
2019-09-07  8:02     ` Romain Naour
2019-09-09 13:49       ` [Buildroot] [External] " Matthew Weber
2019-09-06  9:09 ` [Buildroot] [PATCH 08/11] package/clang: add a host entry for clang Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 09/11] core: allow to use Clang as cross-compiler Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 10/11] toolchain: add a warning when Clang is used " Romain Naour
2019-09-06  9:09 ` [Buildroot] [PATCH 11/11] linux: don't set -Wno-attribute-alias flag " Romain Naour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190906090947.5476-7-romain.naour@smile.fr \
    --to=romain.naour@smile.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.