diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:38:33 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 21:24:12 -0400 |
| commit | a210b08d188404c13498ff075b9a3b28d063642d (patch) | |
| tree | d3107e7164f77f73b5e04602d4462228976db9cc /pkgs/os-specific/linux/klibc | |
| parent | 16781a389237acac3342f8440f5afd282627448f (diff) | |
| download | nixlib-a210b08d188404c13498ff075b9a3b28d063642d.tar nixlib-a210b08d188404c13498ff075b9a3b28d063642d.tar.gz nixlib-a210b08d188404c13498ff075b9a3b28d063642d.tar.bz2 nixlib-a210b08d188404c13498ff075b9a3b28d063642d.tar.lz nixlib-a210b08d188404c13498ff075b9a3b28d063642d.tar.xz nixlib-a210b08d188404c13498ff075b9a3b28d063642d.tar.zst nixlib-a210b08d188404c13498ff075b9a3b28d063642d.zip | |
klibc: Don't use crossAttrs
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 84b66ac0d9c7..92ac1a77898c 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, linuxHeaders, perl }: +{ stdenv, fetchurl, linuxHeaders, perl +, buildPlatform, hostPlatform +}: let commonMakeFlags = [ @@ -23,17 +25,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "stackprotector" ]; makeFlags = commonMakeFlags ++ [ - "KLIBCARCH=${stdenv.platform.kernelArch}" + "KLIBCARCH=${hostPlatform.platform.kernelArch}" "KLIBCKERNELSRC=${linuxHeaders}" - ] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y"; - - crossAttrs = { - makeFlags = commonMakeFlags ++ [ - "KLIBCARCH=${stdenv.cross.platform.kernelArch}" - "KLIBCKERNELSRC=${linuxHeaders.crossDrv}" - "CROSS_COMPILE=${stdenv.cross.config}-" - ] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y"; - }; + ] # TODO(@Ericson2314): We now can get the ABI from + # `hostPlatform.parsed.abi`, is this still a good idea? + ++ stdenv.lib.optional (hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" + ++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.prefix}"; # Install static binaries as well. postInstall = '' |