Re: [ptxdist] [APPLIED] tf-a: stop defining AS and other variables in cross make env

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 341428f780542f718348dd9138c50a577f2998cd.

Michael

[sent from post-receive hook]

On Thu, 11 Apr 2024 17:04:57 +0200, Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> The MAKE_ENV incantation results in PTXdist defining variables like AS
> and LD that point at the respective tools in the cross toolchain.
> 
> This was unused as TF-A doesn't consult the AS setting in the
> environment, and unneeded, because we already supply a CROSS_COMPILE
> option, which is used to derive the correct tools.
> 
> This will expectedly change with TF-A v2.11, which should merge commit
> cc277de81692 ("build: refactor toolchain detection"), currently sitting
> in the integration branch[1].
> 
> This will start accepting AS to be set from the environment and not only
> from the make arguments. This will break using the default cross env as
> TF-A assumes AS to point at a C compiler and not at an assembler.
> 
> This will result in build issues, like[2]:
> 
>   - hang during tool discovery, because `as -v` keeps waiting for input,
>     unlike gcc -v
> 
>   - Assembler errors during build, because GCC-specific options (e.g.
>     -DMACRO=VAL) are now passed to as(1).
> 
> Avoid these issues by not defining the CROSS_ENV.
> 
> [1]: https://github.com/ARM-software/arm-trusted-firmware/commit/cc277de8169
> [2]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27163
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Message-Id: <20240409102429.3143482-1-a.fatoum@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/tf-a.make b/rules/tf-a.make
> index 54fe7d1e37d8..b8c477476c74 100644
> --- a/rules/tf-a.make
> +++ b/rules/tf-a.make
> @@ -74,8 +74,6 @@ TF_A_CONF_TOOL	:= NO
>  # Compile
>  # ----------------------------------------------------------------------------
>  
> -TF_A_MAKE_ENV	:= $(CROSS_ENV)
> -
>  $(STATEDIR)/tf-a.compile:
>  	@$(call targetinfo)
>