diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-12 18:26:33 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-04-12 18:49:01 +0000 |
| commit | 08b22e605bc7d7560ef6ce567caa43f57178715f (patch) | |
| tree | eed46af25264ec81b18ba7a216beec55a84f6683 /lib/systems/examples.nix | |
| parent | 82ca81cd62c785b81bf530837c05babcb9cde8a5 (diff) | |
| parent | 60daed57149403acbb622e48a003422eacea4c16 (diff) | |
| download | nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.gz nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.bz2 nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.lz nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.xz nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.zst nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.zip | |
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
Diffstat (limited to 'lib/systems/examples.nix')
| -rw-r--r-- | lib/systems/examples.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 082be8902bb..02958f31ec8 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -21,14 +21,10 @@ rec { config = "powerpc64le-unknown-linux-musl"; }; - ppc64-elfv1 = { - config = "powerpc64-unknown-linux-elfv1"; - }; - ppc64-elfv2 = { - config = "powerpc64-unknown-linux-elfv2"; + ppc64 = { + config = "powerpc64-unknown-linux-gnu"; + gcc = { abi = "elfv2"; }; # for gcc configuration }; - ppc64 = ppc64-elfv2; # default to modern elfv2 - ppc64-musl = { config = "powerpc64-unknown-linux-musl"; gcc = { abi = "elfv2"; }; # for gcc configuration @@ -60,6 +56,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; + rustc.config = "armv7-linux-androideabi"; sdkVer = "29"; ndkVer = "21"; useAndroidPrebuilt = true; @@ -67,6 +64,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; + rustc.config = "aarch64-linux-android"; sdkVer = "29"; ndkVer = "21"; useAndroidPrebuilt = true; |