authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-04 15:34:32-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-04 15:34:32-05:00
log6cbd1ac51af4300ef11373d16771cf011fb6e572
treeb95882b0e74e07eea5dc1fe5bcc55342f6165af1
parent3ff2381042104d0626545fbc655cb6d8a04ccd0b
signaturelock-open Commit is signed but in an unrecognized format.

zig is now aware of DragonflyBSD versions

2 files changed, 13 insertions(+), 8 deletions(-)

lib/std/target.zig+6-1
...@@ -146,7 +146,6 @@ pub const Target = struct {...@@ -146,7 +146,6 @@ pub const Target = struct {
146 .freestanding,146 .freestanding,
147 .ananas,147 .ananas,
148 .cloudabi,148 .cloudabi,
149 .dragonfly,
150 .fuchsia,149 .fuchsia,
151 .kfreebsd,150 .kfreebsd,
152 .lv2,151 .lv2,
...@@ -215,6 +214,12 @@ pub const Target = struct {...@@ -215,6 +214,12 @@ pub const Target = struct {
215 .max = .{ .major = 6, .minor = 6 },214 .max = .{ .major = 6, .minor = 6 },
216 },215 },
217 },216 },
217 .dragonfly => return .{
218 .semver = .{
219 .min = .{ .major = 5, .minor = 8 },
220 .max = .{ .major = 5, .minor = 8 },
221 },
222 },
218223
219 .linux => return .{224 .linux => return .{
220 .linux = .{225 .linux = .{
lib/std/zig/cross_target.zig+7-7
...@@ -102,7 +102,6 @@ pub const CrossTarget = struct {...@@ -102,7 +102,6 @@ pub const CrossTarget = struct {
102 .freestanding,102 .freestanding,
103 .ananas,103 .ananas,
104 .cloudabi,104 .cloudabi,
105 .dragonfly,
106 .fuchsia,105 .fuchsia,
107 .kfreebsd,106 .kfreebsd,
108 .lv2,107 .lv2,
...@@ -135,10 +134,11 @@ pub const CrossTarget = struct {...@@ -135,10 +134,11 @@ pub const CrossTarget = struct {
135 .freebsd,134 .freebsd,
136 .macosx,135 .macosx,
137 .ios,136 .ios,
138 .netbsd,
139 .openbsd,
140 .tvos,137 .tvos,
141 .watchos,138 .watchos,
139 .netbsd,
140 .openbsd,
141 .dragonfly,
142 => {142 => {
143 self.os_version_min = .{ .semver = os.version_range.semver.min };143 self.os_version_min = .{ .semver = os.version_range.semver.min };
144 self.os_version_max = .{ .semver = os.version_range.semver.max };144 self.os_version_max = .{ .semver = os.version_range.semver.max };
...@@ -677,9 +677,7 @@ pub const CrossTarget = struct {...@@ -677,9 +677,7 @@ pub const CrossTarget = struct {
677 .freestanding,677 .freestanding,
678 .ananas,678 .ananas,
679 .cloudabi,679 .cloudabi,
680 .dragonfly,
681 .fuchsia,680 .fuchsia,
682 .ios,
683 .kfreebsd,681 .kfreebsd,
684 .lv2,682 .lv2,
685 .solaris,683 .solaris,
...@@ -694,8 +692,6 @@ pub const CrossTarget = struct {...@@ -694,8 +692,6 @@ pub const CrossTarget = struct {
694 .amdhsa,692 .amdhsa,
695 .ps4,693 .ps4,
696 .elfiamcu,694 .elfiamcu,
697 .tvos,
698 .watchos,
699 .mesa3d,695 .mesa3d,
700 .contiki,696 .contiki,
701 .amdpal,697 .amdpal,
...@@ -709,9 +705,13 @@ pub const CrossTarget = struct {...@@ -709,9 +705,13 @@ pub const CrossTarget = struct {
709705
710 .freebsd,706 .freebsd,
711 .macosx,707 .macosx,
708 .ios,
709 .tvos,
710 .watchos,
712 .netbsd,711 .netbsd,
713 .openbsd,712 .openbsd,
714 .linux,713 .linux,
714 .dragonfly,
715 => {715 => {
716 var range_it = mem.separate(version_text, "...");716 var range_it = mem.separate(version_text, "...");
717717