diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-06-01 22:52:03 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-07-20 02:38:10 +0300 |
| commit | 2fefa331e76413abb39eda1128462d254e5fbdfa (patch) | |
| tree | 33f837be89d5ae5605cde73e6f7dcee324a8adf9 /pkgs/os-specific/linux/busybox | |
| parent | 8d62f62a7807c52a764a68bb4818f75d08fdc417 (diff) | |
| download | nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.tar nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.tar.gz nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.tar.bz2 nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.tar.lz nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.tar.xz nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.tar.zst nixpkgs-2fefa331e76413abb39eda1128462d254e5fbdfa.zip | |
busybox: Fix cross build with musl
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 92f24b9e9ae..296b19bc5b6 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -64,7 +64,11 @@ stdenv.mkDerivation rec { EOF make oldconfig - '' + lib.optionalString useMusl '' + + runHook postConfigure + ''; + + postConfigure = lib.optionalString useMusl '' makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; @@ -73,10 +77,11 @@ stdenv.mkDerivation rec { crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" - '' + - (if stdenv.cross.platform.kernelMajor == "2.4" then '' - CONFIG_IONICE n - '' else ""); + ''; + + postConfigure = stdenv.lib.optionalString useMusl '' + makeFlagsArray+=("CC=$crossConfig-gcc -isystem ${musl.crossDrv}/include -B${musl.crossDrv}/lib -L${musl.crossDrv}/lib") + ''; }; enableParallelBuilding = true; |