jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-28 08:02:32 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up CrossTarget.getExternalExecutor

Browse Source
This commit is contained in:
Andrew Kelley 2020-02-26 17:35:43 -05:00
parent 622b5b62c2
commit 34d2700af4
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/zig/cross_target.zig
View File

@ -5,6 +5,7 @@ const mem = std.mem;
/// Contains all the same data as `Target`, additionally introducing the concept of "the native target". /// Contains all the same data as `Target`, additionally introducing the concept of "the native target".
/// The purpose of this abstraction is to provide meaningful and unsurprising defaults. /// The purpose of this abstraction is to provide meaningful and unsurprising defaults.
/// This struct does reference any resources and it is copyable.
pub const CrossTarget = struct { pub const CrossTarget = struct {
/// `null` means native. /// `null` means native.
cpu_arch: ?Target.Cpu.Arch = null, cpu_arch: ?Target.Cpu.Arch = null,
@ -554,9 +555,13 @@ pub const CrossTarget = struct {
const os_tag = self.getOsTag(); const os_tag = self.getOsTag();
const os_match = os_tag == Target.current.os.tag; const os_match = os_tag == Target.current.os.tag;
// If the OS matches, and the CPU arch matches, the binary is considered native. // If the OS and CPU arch match, the binary can be considered native.
if (self.os_tag == null and cpu_arch == Target.current.cpu.arch) { if (os_match and cpu_arch == Target.current.cpu.arch) {
return .native; // However, we also need to verify that the dynamic linker path is valid.
// TODO Until that is implemented, we prevent returning `.native` when the OS is non-native.
if (self.os_tag == null) {
return .native;
}
} }
// If the OS matches, we can use QEMU to emulate a foreign architecture. // If the OS matches, we can use QEMU to emulate a foreign architecture.