public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108573 from LumiGuide/fix-armstubs

Browse Source 
raspberrypi-armstubs: fix native compilation on armv7l
This commit is contained in:
Jörg Thalheim 2021-01-12 06:11:46 +00:00 committed by GitHub
commit 231b166b12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
View File

@ -27,10 +27,10 @@ stdenv.mkDerivation {
"LD8=${stdenv.cc.targetPrefix}ld" "LD8=${stdenv.cc.targetPrefix}ld"
"OBJCOPY8=${stdenv.cc.targetPrefix}objcopy" "OBJCOPY8=${stdenv.cc.targetPrefix}objcopy"
"OBJDUMP8=${stdenv.cc.targetPrefix}objdump" "OBJDUMP8=${stdenv.cc.targetPrefix}objdump"
"CC=${stdenv.cc.targetPrefix}cc" "CC7=${stdenv.cc.targetPrefix}cc"
"LD=${stdenv.cc.targetPrefix}ld" "LD7=${stdenv.cc.targetPrefix}ld"
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy" "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy"
"OBJDUMP=${stdenv.cc.targetPrefix}objdump" "OBJDUMP7=${stdenv.cc.targetPrefix}objdump"
] ]
++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ]
++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ]