From 010494d8af69ecbb14619ebab177c32a074b69e5 Mon Sep 17 00:00:00 2001 From: Vexu <15308111+Vexu@users.noreply.github.com> Date: Sat, 23 Nov 2019 23:44:57 +0200 Subject: [PATCH] only test stage2 on linux --- build.zig | 3 ++- src-self-hosted/libc_installation.zig | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.zig b/build.zig index bc54b4be04..e29633e17e 100644 --- a/build.zig +++ b/build.zig @@ -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); } diff --git a/src-self-hosted/libc_installation.zig b/src-self-hosted/libc_installation.zig index 09343877df..42e7de5d08 100644 --- a/src-self-hosted/libc_installation.zig +++ b/src-self-hosted/libc_installation.zig @@ -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,