From patchwork Thu Jan 10 21:14:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1023226 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bJgH2N87z9s7h for ; Fri, 11 Jan 2019 08:15:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B89AE2F94F; Thu, 10 Jan 2019 21:15:21 +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 LentA9pzk41U; Thu, 10 Jan 2019 21:15:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7B0CC21513; Thu, 10 Jan 2019 21:15:19 +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 6B4031C2E2B for ; Thu, 10 Jan 2019 21:15:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6862486DA8 for ; Thu, 10 Jan 2019 21:15:17 +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 v0AmT6YZurhH for ; Thu, 10 Jan 2019 21:15:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B62781E80 for ; Thu, 10 Jan 2019 21:15:16 +0000 (UTC) Received: by mail.bootlin.com (Postfix, from userid 110) id F029E20A08; Thu, 10 Jan 2019 22:15:14 +0100 (CET) Received: from localhost (lfbn-tou-1-411-96.w86-206.abo.wanadoo.fr [86.206.237.96]) by mail.bootlin.com (Postfix) with ESMTPSA id BB714209D7; Thu, 10 Jan 2019 22:15:04 +0100 (CET) From: Thomas Petazzoni To: buildroot@buildroot.org Date: Thu, 10 Jan 2019 22:14:58 +0100 Message-Id: <20190110211500.14368-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190110211500.14368-1-thomas.petazzoni@bootlin.com> References: <20190110211500.14368-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/pkg-kconfig: pass HOSTCC during kconfig steps 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: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The kconfig build logic uses the HOSTCC variable to find the host compiler. It makes sense to explicitly pass a value to this variable, pointing to the host compiler used by Buildroot. During the kconfig step, host-ccache is not ready (host-ccache is only a dependency to the configure step of packages), so we use $(HOSTCC_NOCCACHE). Packages currently using the kconfig-package fell into two categories: - Those not passing any HOSTCC value. For such packages, it was the default host compiler detected by the kconfig build logic that was used. ccache was therefore never used. With this commit, those packages will now be using the host compiler detected by Buildroot. Packages in this situation: at91bootstrap3, barebox, busybox, swupdate, uclibc, xvisor. - Those passing a HOSTCC value. Such packages were passing $(HOSTCC), which doesn't work as host-ccache will not be ready. This commit does not fix them, as they still override HOSTCC. It will be fixed in followup commits. Packages in this situation: uboot and linux. Note that linux was a bit special, because it has a KCONFIG_DEPENDENCIES on the toolchain package, so in fact host-ccache was ready. So practically speaking, this commit does not fix anything, as the two only problematic packages that use $(HOSTCC) are not fixed. However, it makes things more correct by explicitly telling kconfig which compiler to use. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- package/pkg-kconfig.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index d6c95b897e..ce11e14824 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -27,6 +27,9 @@ define kconfig-package-update-config $(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE) endef +PKG_KCONFIG_COMMON_OPTS = \ + HOSTCC=$(HOSTCC_NOCCACHE) + ################################################################################ # inner-kconfig-package -- generates the make targets needed to support a # kconfig package @@ -79,7 +82,8 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch done $(2)_KCONFIG_MAKE = \ - $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS) + $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ + $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) # $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax # of the shell conflicts with Make's own syntax, this means that backticks @@ -195,7 +199,7 @@ $(2)_CONFIGURATOR_MAKE_ENV = \ $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% $$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done $$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) $$(*) + $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) $$(*) rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built} rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed $$($(2)_FIXUP_DOT_CONFIG) @@ -224,7 +228,7 @@ $(1)-check-configuration-done: $(1)-savedefconfig: $(1)-check-configuration-done $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) savedefconfig + $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) savedefconfig # Target to copy back the configuration to the source configuration file # Even though we could use 'cp --preserve-timestamps' here, the separate