| author |  Andrew Kelley <andrew@ziglang.org> 2021-04-15 02:02:36-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-04-15 02:02:36-07:00 |
| log | a38042e3ac446194ae1496513d9b4634b1dd94b8 |
| tree | 5e541657bdf7949de3f963ff0119a46af12e2e21 |
| parent | fa633a658f75d461da00fad9a72456e1420d2d62 |
ci: windows: proper flags to zig build
3 files changed, 11 insertions(+), 6 deletions(-)
- build.zig
ci- azure
- lib
- std
build.zig+3-2
| ... | ... | @@ -55,6 +55,7 @@ pub fn build(b: *Builder) !void { |
| 55 | 55 | |
| 56 | 56 | const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false; |
| 57 | 57 | const is_stage1 = b.option(bool, "stage1", "Build the stage1 compiler, put stage2 behind a feature flag") orelse false; |
| 58 | const omit_stage2 = b.option(bool, "omit-stage2", "Do not include stage2 behind a feature flag inside stage1") orelse false; | |
| 58 | 59 | const static_llvm = b.option(bool, "static-llvm", "Disable integration with system-installed LLVM, Clang, LLD, and libc++") orelse false; |
| 59 | 60 | const enable_llvm = b.option(bool, "enable-llvm", "Build self-hosted compiler with LLVM backend enabled") orelse (is_stage1 or static_llvm); |
| 60 | 61 | const config_h_path_option = b.option([]const u8, "config_h", "Path to the generated config.h"); |
| ... | ... | @@ -196,7 +197,7 @@ pub fn build(b: *Builder) !void { |
| 196 | 197 | exe.addBuildOption(bool, "enable_logging", enable_logging); |
| 197 | 198 | exe.addBuildOption(bool, "enable_tracy", tracy != null); |
| 198 | 199 | exe.addBuildOption(bool, "is_stage1", is_stage1); |
| 199 | exe.addBuildOption(bool, "omit_stage2", false); | |
| 200 | exe.addBuildOption(bool, "omit_stage2", omit_stage2); | |
| 200 | 201 | if (tracy) |tracy_path| { |
| 201 | 202 | const client_cpp = fs.path.join( |
| 202 | 203 | b.allocator, |
| ... | ... | @@ -219,7 +220,7 @@ pub fn build(b: *Builder) !void { |
| 219 | 220 | |
| 220 | 221 | test_stage2.addBuildOption(bool, "skip_non_native", skip_non_native); |
| 221 | 222 | test_stage2.addBuildOption(bool, "is_stage1", is_stage1); |
| 222 | test_stage2.addBuildOption(bool, "omit_stage2", false); | |
| 223 | test_stage2.addBuildOption(bool, "omit_stage2", omit_stage2); | |
| 223 | 224 | test_stage2.addBuildOption(bool, "have_llvm", enable_llvm); |
| 224 | 225 | test_stage2.addBuildOption(bool, "enable_qemu", is_qemu_enabled); |
| 225 | 226 | test_stage2.addBuildOption(bool, "enable_wine", is_wine_enabled); |
ci/azure/windows_script+3-1
| ... | ... | @@ -27,7 +27,9 @@ git fetch --tags |
| 27 | 27 | |
| 28 | 28 | mkdir build |
| 29 | 29 | cd build |
| 30 | "$ZIG" build -Dstage1 -Dtarget=x86_64-windows-gnu \ | |
| 30 | "$ZIG" build -Dstage1 -Domit-stage2 -Drelease \ | |
| 31 | -Dtarget=x86_64-windows-gnu \ | |
| 32 | -Dcpu=x86_64_v2 \ | |
| 31 | 33 | --search-prefix "$PREFIX" \ |
| 32 | 34 | --override-lib-dir "$ZIGDIR/lib" \ |
| 33 | 35 | --prefix "$(pwd)/dist" |
lib/std/build.zig+5-3
| ... | ... | @@ -675,17 +675,19 @@ pub const Builder = struct { |
| 675 | 675 | |
| 676 | 676 | /// Exposes standard `zig build` options for choosing a target. |
| 677 | 677 | pub fn standardTargetOptions(self: *Builder, args: StandardTargetOptionsArgs) CrossTarget { |
| 678 | const triple = self.option( | |
| 678 | const maybe_triple = self.option( | |
| 679 | 679 | []const u8, |
| 680 | 680 | "target", |
| 681 | 681 | "The CPU architecture, OS, and ABI to build for", |
| 682 | ) orelse return args.default_target; | |
| 682 | ); | |
| 683 | const mcpu = self.option([]const u8, "cpu", "Target CPU"); | |
| 683 | 684 | |
| 684 | // TODO add cpu and features as part of the target triple | |
| 685 | const triple = maybe_triple orelse return args.default_target; | |
| 685 | 686 | |
| 686 | 687 | var diags: CrossTarget.ParseOptions.Diagnostics = .{}; |
| 687 | 688 | const selected_target = CrossTarget.parse(.{ |
| 688 | 689 | .arch_os_abi = triple, |
| 690 | .cpu_features = mcpu, | |
| 689 | 691 | .diagnostics = &diags, |
| 690 | 692 | }) catch |err| switch (err) { |
| 691 | 693 | error.UnknownCpuModel => { |