git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108573 from LumiGuide/fix-armstubs

raspberrypi-armstubs: fix native compilation on armv7l

commit231b166b12678f3de9fedeb29c6c4d2dad091cd1 authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 12 Jan 2021, 06:11 (6 years ago) parent980c4c3d6e9755
1 file changed+4−4
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix+4−4
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix+4−4
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
2727 "LD8=${stdenv.cc.targetPrefix}ld"
2828 "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy"
2929 "OBJDUMP8=${stdenv.cc.targetPrefix}objdump"
30− "CC=${stdenv.cc.targetPrefix}cc"
31− "LD=${stdenv.cc.targetPrefix}ld"
32− "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
33− "OBJDUMP=${stdenv.cc.targetPrefix}objdump"
30+ "CC7=${stdenv.cc.targetPrefix}cc"
31+ "LD7=${stdenv.cc.targetPrefix}ld"
32+ "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy"
33+ "OBJDUMP7=${stdenv.cc.targetPrefix}objdump"
3434 ]
3535 ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ]
3636 ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ]