Commit 6cc88458029759bbedcb4d949deb887d464cdd60 | zig

author	Asa Zeren <asaizeren@gmail.com> 2021-03-23 18:58:24-04:00
committer	Veikka Tuominen <git@vexu.eu> 2021-06-11 20:18:19+03:00
log	6cc88458029759bbedcb4d949deb887d464cdd60
tree	1e31fcbe7cd4a2cbb2d1d652d6358825554ad1f0
parent	0bde5ce369ba59f7bc33e97cd5b03d69913108c5

Change defineCMacro to take separate name and value arugments

Before this change, when one or more of name or value are not known at
comptime, build.zig files must allocate and do the concatanation, which can be
cumbersome, and also adds a redundant allocation when name and value are
slices. The new version only does a single allocation directly in the builder's
allocator to concatonate name and value.

The origional behavior is available in defineCMacroRaw, for use in situations
such as parseing c compiler arguments.

Additionally, several places have been updated to use the new funtions.

2 files changed, 19 insertions(+), 4 deletions(-)

build.zig
lib
- std
  - build.zig

build.zig+1-1

...	@@ -117,7 +117,7 @@ pub fn build(b: *Builder) !void {	...	@@ -117,7 +117,7 @@ pub fn build(b: *Builder) !void {
117	// of being built by cmake. But when built by zig it's gonna get a compiler_rt so that	117	// of being built by cmake. But when built by zig it's gonna get a compiler_rt so that
118	// is pointless.	118	// is pointless.
119	exe.addPackagePath("compiler_rt", "src/empty.zig");	119	exe.addPackagePath("compiler_rt", "src/empty.zig");
120	exe.defineCMacro("ZIG_LINK_MODE=Static");	120	exe.defineCMacro("ZIG_LINK_MODE", "Static");
121		121
122	const softfloat = b.addStaticLibrary("softfloat", null);	122	const softfloat = b.addStaticLibrary("softfloat", null);
123	softfloat.setBuildMode(.ReleaseFast);	123	softfloat.setBuildMode(.ReleaseFast);

lib/std/build.zig+18-3

 @@ -1700,8 +1700,23 @@ pub const LibExeObjStep = struct {
         }
     }
+    /// If the value is omitted, it is set to 1.
+    /// `name` and `value` need not live longer than the function call.
+    pub fn defineCMacro(self: *LibExeObjStep, name: []const u8, value: ?[]const u8) void {
+        var macro = self.builder.allocator.alloc(
+            u8,
+            name.len + if (value) |value_slice| value_slice.len + 1 else 0,
+        ) catch |err| if (err == error.OutOfMemory) @panic("Out of memory") else unreachable;
+        mem.copy(u8, macro, name);
+        if (value) |value_slice| {
+            macro[name.len] = '=';
+            mem.copy(u8, macro[name.len + 1 ..], value_slice);
+        }
+        self.c_macros.append(macro) catch unreachable;
+    }
     /// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1.
-    pub fn defineCMacro(self: *LibExeObjStep, name_and_value: []const u8) void {
+    pub fn defineCMacroRaw(self: *LibExeObjStep, name_and_value: []const u8) void {
         self.c_macros.append(self.builder.dupe(name_and_value)) catch unreachable;
     }
 @@ -1790,9 +1805,9 @@ pub const LibExeObjStep = struct {
                 self.linkSystemLibraryName(tok["-l".len..]);
             } else if (mem.eql(u8, tok, "-D")) {
                 const macro = it.next() orelse return error.PkgConfigInvalidOutput;
-                self.defineCMacro(macro);
+                self.defineCMacroRaw(macro);
             } else if (mem.startsWith(u8, tok, "-D")) {
-                self.defineCMacro(tok["-D".len..]);
+                self.defineCMacroRaw(tok["-D".len..]);
             } else if (mem.eql(u8, tok, "-pthread")) {
                 self.linkLibC();
             } else if (self.builder.verbose) {