diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2024-04-01 09:52:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2024-04-30 18:20:23 -0400 |
| commit | 266cdd7d3795263bbcb45ebcf3923a17985d2fb2 (patch) | |
| tree | d3d1108efc5696460bbb51e02eca4f9246d8cf8a /lib/systems | |
| parent | 756025cc002101748006c7efbe9cf2761850cbdf (diff) | |
treewide: freebsd13 -> freebsd
Co-authored-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/doubles.nix | 2 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 2 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 13f029ee1f40b..b4cd5acfcc5b2 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -13,7 +13,7 @@ let "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" # FreeBSD - "i686-freebsd13" "x86_64-freebsd13" + "i686-freebsd" "x86_64-freebsd" # Genode "aarch64-genode" "i686-genode" "x86_64-genode" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index b16445eadfea8..8a3726f369682 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -328,7 +328,7 @@ rec { # BSDs x86_64-freebsd = { - config = "x86_64-unknown-freebsd13"; + config = "x86_64-unknown-freebsd"; useLLVM = true; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 191e9734b879a..4890912d7fed4 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -326,11 +326,7 @@ rec { # the normalized name for macOS. macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; ios = { execFormat = macho; families = { inherit darwin; }; }; - # A tricky thing about FreeBSD is that there is no stable ABI across - # versions. That means that putting in the version as part of the - # config string is paramount. - freebsd12 = { execFormat = elf; families = { inherit bsd; }; name = "freebsd"; version = 12; }; - freebsd13 = { execFormat = elf; families = { inherit bsd; }; name = "freebsd"; version = 13; }; + freebsd = { execFormat = elf; families = { inherit bsd; }; name = "freebsd"; }; linux = { execFormat = elf; families = { }; }; netbsd = { execFormat = elf; families = { inherit bsd; }; }; none = { execFormat = unknown; families = { }; }; |