Revert "lib: Clean up how linux and gcc config is specified"

This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
This commit is contained in:
Jonathan Ringer
2021-01-22 14:07:06 -08:00
parent 2e5475381b
commit 0bc275e634
37 changed files with 434 additions and 440 deletions
@@ -1,7 +1,7 @@
{ lib, targetPlatform }:
let
p = targetPlatform.gcc or {}
p = targetPlatform.platform.gcc or {}
// targetPlatform.parsed.abi;
in lib.concatLists [
(lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
+1 -1
View File
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
let
arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
march = {
x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
i686 = "pentium4";
aarch64 = "armv8-a";
}.${arch}
+1 -1
View File
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
let
arch = head (splitString "-" stdenv.system);
march = {
x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
i686 = "pentium4";
aarch64 = "armv8-a";
}.${arch}
+1 -1
View File
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
let
arch = head (splitString "-" stdenv.system);
march = {
x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
i686 = "pentium4";
aarch64 = "armv8-a";
}.${arch}