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

busybox: Fix cross build with musl

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-06-01 22:52:03 +03:00
parent 8d62f62a78
commit 2fefa331e7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/busybox/default.nix
View File

@ -64,7 +64,11 @@ stdenv.mkDerivation rec {
EOF EOF
make oldconfig make oldconfig
'' + lib.optionalString useMusl ''
runHook postConfigure
'';
postConfigure = lib.optionalString useMusl ''
makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
''; '';
@ -73,10 +77,11 @@ stdenv.mkDerivation rec {
crossAttrs = { crossAttrs = {
extraCrossConfig = '' extraCrossConfig = ''
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"
'' + '';
(if stdenv.cross.platform.kernelMajor == "2.4" then ''
CONFIG_IONICE n postConfigure = stdenv.lib.optionalString useMusl ''
'' else ""); makeFlagsArray+=("CC=$crossConfig-gcc -isystem ${musl.crossDrv}/include -B${musl.crossDrv}/lib -L${musl.crossDrv}/lib")
'';
}; };
enableParallelBuilding = true; enableParallelBuilding = true;