From patchwork Sat Sep 7 09:40:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1159307 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="JWKXFgV7"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46QTvB5Pnwz9sDB for ; Sat, 7 Sep 2019 19:40:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 286EE88543; Sat, 7 Sep 2019 09:40:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cjG3CGulBOsp; Sat, 7 Sep 2019 09:40:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4D04488561; Sat, 7 Sep 2019 09:40:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 53A831BF401 for ; Sat, 7 Sep 2019 09:40:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4F4B286DB3 for ; Sat, 7 Sep 2019 09:40:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZoSHl9fyAajl for ; Sat, 7 Sep 2019 09:40:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6BDBB87DD6 for ; Sat, 7 Sep 2019 09:40:41 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y19so8927696wrd.3 for ; Sat, 07 Sep 2019 02:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Apsydkc6OBguBFzHM/WOvs4z+mBjk+MWX8LRgxiaPbI=; b=JWKXFgV7En088JyM/IXeofK0P2U5CvhS18DPREAsUPnf4+wD3mtP8aBhRwLk3h7pzi mrQoNd2o1JyGUbOMEGIZ2rTIlGB7H2FpUV5P6QY5Q8HWF5K+AP5uCMGg5SyCTBcd+oFw okx4l0T2S1lnA6Sg2hRubbOuWhAdPaBP4gHquBbzyzjIuzMEQQcdOGWSyqEEzjYwee1U dtazbfz/JIMRIt0lN+kf6aWRcKP6oQzyaaDlactj1AnjT/JcmbqHP4ul1YWeq/uj9DVJ O6c0wXGtRJI36PBCvYWJbtBr1pWl/nBUDilzXO34P2Xkqh1DgEOP8J+v1rYxlqCSZ26W KuGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Apsydkc6OBguBFzHM/WOvs4z+mBjk+MWX8LRgxiaPbI=; b=Sd9frnZeaVL/5S3MrF5CZnRdhzc1BtwZk1r2It7XoMai1Ddos5czy5JgNvzngeWtki 2J3j2LBgtCnapI/BGI0dPahGR0TyDucpDragVv3wfkRSCPzHfC9anjaQjweloG6GyOSv edIlw76VIOfncslAZuw2UdmoJAHNWx/oOBmcq+0C1959OOtzAfk3+T1UyEK1ZffRz0Bi LrvUaTQj5Zn5FGrTuyjKXfTYIrFPJxXEtSxQjaIV39zRDv08fBXjsc9sAeWLSeOQNn2N QeyTWEW0aSq0pqgtnC4XH3rEuogkXDWSoYqCQZKHC9QfLreDQmQtBpnBopORHbNeViP1 NaiA== X-Gm-Message-State: APjAAAWEpAP5kiIYrO1ck2lnlHUkDOz7wUtTNcOB0G1lg6s4EfJ7zY29 c94paCT7KE+Zqf6FdgJ09c+avH/K1Bs= X-Google-Smtp-Source: APXvYqykQRDeYDux87h7K6UVzlvc0ijOu/NmqNe3dD0YF4qcTsb+iBlM9QphYUKHVPRxLXnZn5sWrg== X-Received: by 2002:a5d:65c2:: with SMTP id e2mr11195464wrw.128.1567849239765; Sat, 07 Sep 2019 02:40:39 -0700 (PDT) Received: from P-ASN-Evian.home (2a01cb0589880c00c543929d43aec786.ipv6.abo.wanadoo.fr. [2a01:cb05:8988:c00:c543:929d:43ae:c786]) by smtp.gmail.com with ESMTPSA id f13sm6384700wrq.3.2019.09.07.02.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Sep 2019 02:40:39 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 7 Sep 2019 11:40:21 +0200 Message-Id: <20190907094027.9537-7-romain.naour@smile.fr> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190907094027.9537-1-romain.naour@smile.fr> References: <20190907094027.9537-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 06/12] package/meson: use TARGET_{CC, CXX} instead of TARGET_CROSS for cc and cpp X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Valentin Korenblit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Cc: Matt Weber Cc: Valentin Korenblit --- 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(-) 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@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' diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 3267581fc6..6b4491d24f 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -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" \ diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 0b811d1cc0..e035dd1722 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -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" \