diff options
| author | Daniel Goertzen <daniel.goertzen@gmail.com> | 2019-01-06 12:57:36 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-06 12:57:36 -0600 |
| commit | 1c10efc912c240901b186974b8ea4f48814c7b8b (patch) | |
| tree | 25a5e4591636647e6ce9d35227737b1cfb76f14f /pkgs/stdenv/generic | |
| parent | a4250d14784e318f44d084095f9a41aa4375105b (diff) | |
add generic x86_32 support (#52634)
* add generic x86_32 support
- Add support for i386-i586.
- Add `isx86_32` predicate that can replace most uses of `isi686`.
- `isi686` is reinterpreted to mean "exactly i686 arch, and not say i585 or i386".
- This branch was used to build working i586 kernel running on i586 hardware.
* revert `isi[345]86`, remove dead code
- Remove changes to dead code in `doubles.nix` and `for-meta.nix`.
- Remove `isi[345]86` predicates since other cpu families don't have specific model predicates.
* remove i386-linux since linux not supported on that cpu
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f77f43aea886..fccab8f60ff2 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -122,7 +122,9 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; + isi686 isx86_32 isx86_64 + is32bit is64bit + isAarch32 isAarch64 isMips isBigEndian; isArm = lib.warn "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; |