diff options
| author | John Ericson <git@JohnEricson.me> | 2020-09-01 22:31:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 22:31:16 -0400 |
| commit | 1965a241fc2476ff63e8b97019a3db58707a8325 (patch) | |
| tree | 7e5efc37712cd6e72c85ee08a5b2a6965c3b4f6a /pkgs/build-support/cc-wrapper | |
| parent | 54eacc77f7e8fd20db467f1363fee937ca8f5fa1 (diff) | |
| parent | c5fe132b3c5da5044c01a9bd4aa4ab45795cb9e6 (diff) | |
| download | nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.gz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.bz2 nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.lz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.xz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.zst nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.zip | |
Merge pull request #61019 from volth/gcc.arch-amd
platform.gcc.arch: support for AMD CPUs
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6ee287e287b..bfb15f2f783 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -64,18 +64,26 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: if isGNU then - { skylake = versionAtLeast ccVersion "6.0"; + { # Intel + skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; + # AMD + znver1 = versionAtLeast ccVersion "6.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else if isClang then - { cannonlake = versionAtLeast ccVersion "5.0"; + { # Intel + cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; knm = versionAtLeast ccVersion "7.0"; + # AMD + znver1 = versionAtLeast ccVersion "4.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else false; |