| author |  Veikka Tuominen <git@vexu.eu> 2019-11-23 23:44:57+02:00 |
| committer | Veikka Tuominen <git@vexu.eu> 2019-11-23 23:45:54+02:00 |
| log | 010494d8af69ecbb14619ebab177c32a074b69e5 |
| tree | 144ba8d16c9b05307302a10b66f6871bd120a775 |
| parent | 89310dad561357b687316bc849594485d55a47ef |
| signature |  Commit is signed but in an unrecognized format. |
only test stage2 on linux
2 files changed, 5 insertions(+), 4 deletions(-)
- build.zig
src-self-hosted
build.zig+2-1
| ... | @@ -73,7 +73,8 @@ pub fn build(b: *Builder) !void { | ... | @@ -73,7 +73,8 @@ pub fn build(b: *Builder) !void { |
| 73 | const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false; | 73 | const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false; |
| 74 | const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false; | 74 | const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false; |
| 75 | const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false; | 75 | const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false; |
| 76 | if (!skip_self_hosted) { | 76 | if (!skip_self_hosted and builtin.os == .linux) { |
| 77 | // TODO evented I/O other OS'spu | ||
| 77 | test_step.dependOn(&exe.step); | 78 | test_step.dependOn(&exe.step); |
| 78 | } | 79 | } |
| 79 | 80 |
src-self-hosted/libc_installation.zig+3-3
| ... | @@ -160,9 +160,9 @@ pub const LibCInstallation = struct { | ... | @@ -160,9 +160,9 @@ pub const LibCInstallation = struct { |
| 160 | if (sdk.msvc_lib_dir_ptr != 0) { | 160 | if (sdk.msvc_lib_dir_ptr != 0) { |
| 161 | self.msvc_lib_dir = try std.mem.dupe(allocator, u8, sdk.msvc_lib_dir_ptr[0..sdk.msvc_lib_dir_len]); | 161 | self.msvc_lib_dir = try std.mem.dupe(allocator, u8, sdk.msvc_lib_dir_ptr[0..sdk.msvc_lib_dir_len]); |
| 162 | } | 162 | } |
| 163 | try group.call(findNativeKernel32LibDir, self, sdk); | 163 | try group.call(findNativeKernel32LibDir, allocator, self, sdk); |
| 164 | try group.call(findNativeIncludeDirWindows, self, sdk); | 164 | try group.call(findNativeIncludeDirWindows, self, allocator, sdk); |
| 165 | try group.call(findNativeLibDirWindows, self, sdk); | 165 | try group.call(findNativeLibDirWindows, self, allocator, sdk); |
| 166 | }, | 166 | }, |
| 167 | c.ZigFindWindowsSdkError.OutOfMemory => return error.OutOfMemory, | 167 | c.ZigFindWindowsSdkError.OutOfMemory => return error.OutOfMemory, |
| 168 | c.ZigFindWindowsSdkError.NotFound => return error.NotFound, | 168 | c.ZigFindWindowsSdkError.NotFound => return error.NotFound, |