From b1981b02e183fb376a45932c9a901ea22d4bf77a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 9 Aug 2023 14:20:15 +0200 Subject: [PATCH] arm-trusted-firmware.armTrustedFirmwareTools: remove CC_FOR_BUILD As explained in the new comment, we trick the build system here to build its build tools for the host platform. To make this even more foolproof / reliable, stop adding CC_FOR_BUILD to the environment, so there can be no mix up. --- pkgs/misc/arm-trusted-firmware/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index a5ab7ba83da..92bd7e0bee5 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -89,6 +89,11 @@ in { inherit buildArmTrustedFirmware; armTrustedFirmwareTools = buildArmTrustedFirmware rec { + # Normally, arm-trusted-firmware builds the build tools for buildPlatform + # using CC_FOR_BUILD (or as it calls it HOSTCC). Since want to build them + # for the hostPlatform here, we trick it by overriding the HOSTCC setting + # and, to be safe, remove CC_FOR_BUILD from the environment. + depsBuildBuild = [ ]; extraMakeFlags = [ "HOSTCC=${stdenv.cc.targetPrefix}gcc" "fiptool" "certtool"