From d6e97555bd02f48654fb9f47f42645e8505713cc Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 6 Jan 2021 11:17:10 +0100 Subject: [PATCH] raspberrypi-armstubs: fix native compilation on armv7l --- pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 2f2d0081fffb..58705773b027 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation { "LD8=${stdenv.cc.targetPrefix}ld" "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy" "OBJDUMP8=${stdenv.cc.targetPrefix}objdump" - "CC=${stdenv.cc.targetPrefix}cc" - "LD=${stdenv.cc.targetPrefix}ld" - "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - "OBJDUMP=${stdenv.cc.targetPrefix}objdump" + "CC7=${stdenv.cc.targetPrefix}cc" + "LD7=${stdenv.cc.targetPrefix}ld" + "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy" + "OBJDUMP7=${stdenv.cc.targetPrefix}objdump" ] ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ]