[Buildroot] [PATCH 1/3] package/pkg-kconfig: pass HOSTCC during kconfig steps

From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/3] package/pkg-kconfig: pass HOSTCC during kconfig steps
Date: Sun, 13 Jan 2019 22:43:24 +0100	[thread overview]
Message-ID: <20190113214324.GK2428@scaer> (raw)
In-Reply-To: <20190110211500.14368-2-thomas.petazzoni@bootlin.com>

Thomas, All,

On 2019-01-10 22:14 +0100, Thomas Petazzoni spake thusly:
> 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 <thomas.petazzoni@bootlin.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
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
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'