Commit a38042e3ac446194ae1496513d9b4634b1dd94b8 | zig

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
  - windows_script
lib
- std
  - build.zig

build.zig+3-2

ci/azure/windows_script+3-1

 @@ -27,7 +27,9 @@ git fetch --tags
 mkdir build
 cd build
-"$ZIG" build -Dstage1 -Dtarget=x86_64-windows-gnu \
+"$ZIG" build -Dstage1 -Domit-stage2 -Drelease \
+    -Dtarget=x86_64-windows-gnu \
+    -Dcpu=x86_64_v2 \
     --search-prefix "$PREFIX" \
     --override-lib-dir "$ZIGDIR/lib" \
     --prefix "$(pwd)/dist"

lib/std/build.zig+5-3

 @@ -675,17 +675,19 @@ pub const Builder = struct {
     /// Exposes standard `zig build` options for choosing a target.
     pub fn standardTargetOptions(self: *Builder, args: StandardTargetOptionsArgs) CrossTarget {
-        const triple = self.option(
+        const maybe_triple = self.option(
             []const u8,
             "target",
             "The CPU architecture, OS, and ABI to build for",
-        ) orelse return args.default_target;
+        );
+        const mcpu = self.option([]const u8, "cpu", "Target CPU");
-        // TODO add cpu and features as part of the target triple
+        const triple = maybe_triple orelse return args.default_target;
         var diags: CrossTarget.ParseOptions.Diagnostics = .{};
         const selected_target = CrossTarget.parse(.{
             .arch_os_abi = triple,
+            .cpu_features = mcpu,
             .diagnostics = &diags,
         }) catch |err| switch (err) {
             error.UnknownCpuModel => {

...	@@ -55,6 +55,7 @@ pub fn build(b: *Builder) !void {	...	@@ -55,6 +55,7 @@ pub fn build(b: *Builder) !void {
55		55
56	const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;	56	const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;
57	const is_stage1 = b.option(bool, "stage1", "Build the stage1 compiler, put stage2 behind a feature flag") orelse false;	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	const static_llvm = b.option(bool, "static-llvm", "Disable integration with system-installed LLVM, Clang, LLD, and libc++") orelse false;	59	const static_llvm = b.option(bool, "static-llvm", "Disable integration with system-installed LLVM, Clang, LLD, and libc++") orelse false;
59	const enable_llvm = b.option(bool, "enable-llvm", "Build self-hosted compiler with LLVM backend enabled") orelse (is_stage1 or static_llvm);	60	const enable_llvm = b.option(bool, "enable-llvm", "Build self-hosted compiler with LLVM backend enabled") orelse (is_stage1 or static_llvm);
60	const config_h_path_option = b.option([]const u8, "config_h", "Path to the generated config.h");	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,7 +197,7 @@ pub fn build(b: *Builder) !void {
196	exe.addBuildOption(bool, "enable_logging", enable_logging);	197	exe.addBuildOption(bool, "enable_logging", enable_logging);
197	exe.addBuildOption(bool, "enable_tracy", tracy != null);	198	exe.addBuildOption(bool, "enable_tracy", tracy != null);
198	exe.addBuildOption(bool, "is_stage1", is_stage1);	199	exe.addBuildOption(bool, "is_stage1", is_stage1);
199	exe.addBuildOption(bool, "omit_stage2", false);	200	exe.addBuildOption(bool, "omit_stage2", omit_stage2);
200	if (tracy) \|tracy_path\| {	201	if (tracy) \|tracy_path\| {
201	const client_cpp = fs.path.join(	202	const client_cpp = fs.path.join(
202	b.allocator,	203	b.allocator,
...	@@ -219,7 +220,7 @@ pub fn build(b: *Builder) !void {	...	@@ -219,7 +220,7 @@ pub fn build(b: *Builder) !void {
219		220
220	test_stage2.addBuildOption(bool, "skip_non_native", skip_non_native);	221	test_stage2.addBuildOption(bool, "skip_non_native", skip_non_native);
221	test_stage2.addBuildOption(bool, "is_stage1", is_stage1);	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	test_stage2.addBuildOption(bool, "have_llvm", enable_llvm);	224	test_stage2.addBuildOption(bool, "have_llvm", enable_llvm);
224	test_stage2.addBuildOption(bool, "enable_qemu", is_qemu_enabled);	225	test_stage2.addBuildOption(bool, "enable_qemu", is_qemu_enabled);
225	test_stage2.addBuildOption(bool, "enable_wine", is_wine_enabled);	226	test_stage2.addBuildOption(bool, "enable_wine", is_wine_enabled);