From patchwork Sun Jun 30 19:29:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 255941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6D6182C00A1 for ; Mon, 1 Jul 2013 07:19:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 452BC313AD; Sun, 30 Jun 2013 21:19:34 +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 GrujWu1rs4WW; Sun, 30 Jun 2013 21:19:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E3DB92F571; Sun, 30 Jun 2013 21:19:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2989F8F79F for ; Sun, 30 Jun 2013 21:19:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A7B489E48 for ; Sun, 30 Jun 2013 21:19:10 +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 Ftfk6cCV2DSf for ; Sun, 30 Jun 2013 21:18:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by whitealder.osuosl.org (Postfix) with ESMTP id 221468FAB2 for ; Sun, 30 Jun 2013 19:29:33 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 9B5BF75A; Sun, 30 Jun 2013 21:29:33 +0200 (CEST) Received: from localhost (AToulouse-651-1-103-169.w109-222.abo.wanadoo.fr [109.222.70.169]) by mail.free-electrons.com (Postfix) with ESMTPSA id 540AA7CA for ; Sun, 30 Jun 2013 21:29:33 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 30 Jun 2013 21:29:07 +0200 Message-Id: <1372620553-11416-18-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1372620553-11416-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1372620553-11416-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 17/23] Use more sensible names for the external/ctng targets X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Instead of using the 'uclibc' target for all toolchain backends, introduce more sensible target names for the external toolchain and Crosstool-NG toolchain backend make targets. Signed-off-by: Thomas Petazzoni --- Makefile | 7 +++++-- toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 16 +++++++--------- toolchain/toolchain-external/ext-tool.mk | 5 ++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index e3e2750..7a4602c 100644 --- a/Makefile +++ b/Makefile @@ -225,9 +225,12 @@ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) BASE_TARGETS += toolchain-buildroot -else -BASE_TARGETS += uclibc +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +BASE_TARGETS += toolchain-external +else ifeq ($(BR2_TOOLCHAIN_CTNG),y) +BASE_TARGETS += toolchain-crosstool-ng endif + TARGETS:= # silent mode requested? diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk index 79ad7e1..7130536 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk @@ -22,15 +22,13 @@ PATH=$(HOST_PATH) ct-ng -C $(CTNG_DIR) --no-print-directory $(1) endef #----------------------------------------------------------------------------- -# 'uclibc' is the target to depend on to get the toolchain and prepare -# the staging directory and co. -uclibc: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed - -# 'uclibc-source' is the target used by the infra structure to mean -# "we just want to download the toolchain's sources, not build it" -# For crosstool-NG, we need it to be configured before we can download; -# then we have to override a config option to just do the download -uclibc-source: $(CTNG_DIR)/.config +toolchain-crosstool-ng: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed + +# The target used by the infra structure to mean "we just want to +# download the toolchain's sources, not build it" For crosstool-NG, we +# need it to be configured before we can download; then we have to +# override a config option to just do the download +toolchain-crosstool-ng-source: $(CTNG_DIR)/.config $(Q)$(call ctng,build CT_ONLY_DOWNLOAD=y) #----------------------------------------------------------------------------- diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 1d76a66..b8d77ad 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -539,10 +539,9 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL) $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s -Wl,--hash-style=both \ toolchain/toolchain-external/ext-toolchain-wrapper.c -o $@ -# 'uclibc' is the target to provide toolchain / staging dir -uclibc: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper +toolchain-external: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) # download ext toolchain if so configured -uclibc-source: $(addprefix $(DL_DIR)/,$(TOOLCHAIN_EXTERNAL_SOURCE)) +toolchain-external-source: $(addprefix $(DL_DIR)/,$(TOOLCHAIN_EXTERNAL_SOURCE)) endif