diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 20:33:55 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-23 10:01:28 -0500 |
| commit | 9c213398b312e0f0bb9cdf05090fd20223a82ad0 (patch) | |
| tree | c645a940abedfc4abf51dbb99ce1a8e871e5e799 /pkgs/os-specific/linux/klibc | |
| parent | 2bc16b381e09eeb75deefdf6fd5bdc4771b795f3 (diff) | |
| download | nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.gz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.bz2 nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.lz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.xz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.zst nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.zip | |
lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that commit for details. This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 65ab71bd562..dc96f3b6a62 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "stackprotector" ]; makeFlags = commonMakeFlags ++ [ - "KLIBCARCH=${stdenv.hostPlatform.platform.kernelArch}" + "KLIBCARCH=${stdenv.hostPlatform.linuxArch}" "KLIBCKERNELSRC=${linuxHeaders}" ] # TODO(@Ericson2314): We now can get the ABI from # `stdenv.hostPlatform.parsed.abi`, is this still a good idea? - ++ lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" + ++ lib.optional (stdenv.hostPlatform.linuxArch == "arm") "CONFIG_AEABI=y" ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; # Install static binaries as well. |