Merge pull request #110544 from Ericson2314/no-platform

top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
parent 10bb072072 2dde58903e
commit 12881a7aa7
40 changed files with 464 additions and 468 deletions
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,7 +1,7 @@
 { lib, targetPlatform }:

 let
-  p =  targetPlatform.platform.gcc or {}
+  p =  targetPlatform.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