From patchwork Sun Feb 11 16:58:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 871787 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zfZkl1Zhfz9t6N for ; Mon, 12 Feb 2018 03:58:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 39CAF8713D; Sun, 11 Feb 2018 16:58:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pHuS2sO5Jd-x; Sun, 11 Feb 2018 16:58:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D761586F9F; Sun, 11 Feb 2018 16:58:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 73E311C26AA for ; Sun, 11 Feb 2018 16:58:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7144226C7A for ; Sun, 11 Feb 2018 16:58:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S-NKhCs6E+hr for ; Sun, 11 Feb 2018 16:58:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by silver.osuosl.org (Postfix) with ESMTPS id 0FE912DA1A for ; Sun, 11 Feb 2018 16:58:32 +0000 (UTC) Received: from localhost.localdomain (unknown [185.225.208.29]) (Authenticated sender: eric.le.bihan.dev) by smtp5-g21.free.fr (Postfix) with ESMTPSA id 687B65FFBE for ; Sun, 11 Feb 2018 17:58:28 +0100 (CET) From: Eric Le Bihan To: buildroot@buildroot.org Date: Sun, 11 Feb 2018 17:58:19 +0100 Message-Id: <20180211165824.20213-2-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180211165824.20213-1-eric.le.bihan.dev@free.fr> References: <20180211165824.20213-1-eric.le.bihan.dev@free.fr> Subject: [Buildroot] [PATCH 1/6] rustc: use RUSTC_{HOST,TARGET}_NAME X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" utils/check-package complains as follows: package/rustc/rustc.mk:10: possible typo: RUST_TARGET_NAME -> *RUSTC* package/rustc/rustc.mk:18: possible typo: RUST_HOST_NAME -> *RUSTC* As RUST_{HOST,TARGET}_NAME are related to the Rust compiler, it sounds sensible to rename them to RUSTC_{HOST,TARGET}_NAME. To make it even more happy, clean up Config.in.host too. Signed-off-by: Eric Le Bihan --- package/rustc/Config.in.host | 3 +-- package/rustc/rustc.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index d93ff05209..bdbe488f48 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -1,6 +1,5 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # The pre-built Rust standard library is only available for the # following architectures/ABIs, and is built against glibc. default y if BR2_i386 @@ -12,6 +11,7 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \ && BR2_MIPS_NABI64 depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" config BR2_PACKAGE_HOST_RUSTC_ARCH string @@ -76,4 +76,3 @@ config BR2_PACKAGE_PROVIDES_HOST_RUSTC default "host-rust-bin" if BR2_PACKAGE_HOST_RUST_BIN endif - diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 7a951c0cfd..bed74f3c2c 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -7,7 +7,7 @@ RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH)) RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI)) -RUST_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) +RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) ifeq ($(HOSTARCH),x86) RUSTC_HOST_ARCH = i686 @@ -15,6 +15,6 @@ else RUSTC_HOST_ARCH = $(HOSTARCH) endif -RUST_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu +RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package))