Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only test stage2 on linux

master
Vexu 2019-11-23 23:44:57 +02:00
parent 89310dad56
commit 010494d8af
No known key found for this signature in database
GPG Key ID: 5AEABFCAFF5CD8D6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.zig
View File

@ -73,7 +73,8 @@ pub fn build(b: *Builder) !void {
const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;
const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false;
if (!skip_self_hosted) {
if (!skip_self_hosted and builtin.os == .linux) {
// TODO evented I/O other OS'spu
test_step.dependOn(&exe.step);
}

6
src-self-hosted/libc_installation.zig
View File

@ -160,9 +160,9 @@ pub const LibCInstallation = struct {
if (sdk.msvc_lib_dir_ptr != 0) {
self.msvc_lib_dir = try std.mem.dupe(allocator, u8, sdk.msvc_lib_dir_ptr[0..sdk.msvc_lib_dir_len]);
}
try group.call(findNativeKernel32LibDir, self, sdk);
try group.call(findNativeIncludeDirWindows, self, sdk);
try group.call(findNativeLibDirWindows, self, sdk);
try group.call(findNativeKernel32LibDir, allocator, self, sdk);
try group.call(findNativeIncludeDirWindows, self, allocator, sdk);
try group.call(findNativeLibDirWindows, self, allocator, sdk);
},
c.ZigFindWindowsSdkError.OutOfMemory => return error.OutOfMemory,
c.ZigFindWindowsSdkError.NotFound => return error.NotFound,