Merge master into staging-next

2021-04-15 06:05:40 +00:00
parent b49be812b5 a97f6bbcc4
commit 8b35f0c117
12 changed files with 152 additions and 35 deletions
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -250,11 +250,20 @@ rec {

  # BSDs

-  amd64-netbsd = {
+  # Deprecate
+  amd64-netbsd = x86_64-netbsd;
+
+  x86_64-netbsd = {
    config = "x86_64-unknown-netbsd";
    libc = "nblibc";
  };

+  x86_64-netbsd-llvm = {
+    config = "x86_64-unknown-netbsd";
+    libc = "nblibc";
+    useLLVM = true;
+  };
+
  #
  # WASM
  #