diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
| commit | 1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (patch) | |
| tree | b8239cfc8cced160642aa698e18048844164ccc6 /pkgs/os-specific/linux/busybox | |
| parent | cc540843fe88a5e490e07e861f8dbb8f4714ece7 (diff) | |
| parent | db7b4fb073d25832ecc4e216d410ad2dde153c43 (diff) | |
| download | nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.gz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.bz2 nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.lz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.xz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.zst nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
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 182b8c01c391..eaf45745f024 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -66,7 +66,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") ''; @@ -75,10 +79,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; |