From cae8952548518c9504ca40f5212cafa79622f04b Mon Sep 17 00:00:00 2001
From: fardragon <michaldrozd@protonmail.ch>
Date: Fri, 5 Jun 2026 23:06:41 +0200
Subject: [PATCH] Work around multiline string literals weirdness

---
 lib/compiler/Maker/Step/ConfigHeader.zig | 12 ++++--------
 test/standalone/config_header/build.zig  |  7 +------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/compiler/Maker/Step/ConfigHeader.zig b/lib/compiler/Maker/Step/ConfigHeader.zig
index a483ef7bd5cb86cdd2215e6ddacae1a3be692aef..f0c2d27b371eb4fed9e701d6377b5206ba31773a 100644
--- a/lib/compiler/Maker/Step/ConfigHeader.zig
+++ b/lib/compiler/Maker/Step/ConfigHeader.zig
@@ -392,17 +392,13 @@ fn renderBlank(
     };
 
     try w.print(
-        \\#ifndef {[0]f}
-        \\#define {[0]f}
-        \\
-    , .{include_guard_fmt});
+        "#ifndef {[0]f}{[1]s}#define {[0]f}{[1]s}",
+        .{ include_guard_fmt, os_newline },
+    );
 
     for (value_map.keys(), value_pairs) |name, pair| try renderValueC(conf, w, os_newline, name, pair.index);
 
-    try w.print(
-        \\#endif /* {f} */
-        \\
-    , .{include_guard_fmt});
+    try w.print("#endif /* {f} */{s}", .{ include_guard_fmt, os_newline });
 }
 
 const IncludeGuardFmt = struct {
diff --git a/test/standalone/config_header/build.zig b/test/standalone/config_header/build.zig
index 84439ba34cd7d97ae6cef9c9df99e2e0e9df5cd3..88297e12d3fbe6c620128c68dbf9d0a1681e9e57 100644
--- a/test/standalone/config_header/build.zig
+++ b/test/standalone/config_header/build.zig
@@ -16,18 +16,17 @@ pub fn build(b: *std.Build) void {
             .SOME_ENUM = @as(enum { foo, bar }, .foo),
             .SOME_ENUM_LITERAL = .@"test",
             .SOME_STRING = "test",
-
             .PREFIX_SPACE = null,
             .PREFIX_TAB = null,
             .POSTFIX_SPACE = null,
             .POSTFIX_TAB = null,
-
             .SOME_UNDERSCORED = true,
         },
     );
     const check_config_header = b.addCheckFile(config_header.getOutputFile(), .{
         .expected_exact = @embedFile("autoconf_undef/config.h"),
     });
+    test_step.dependOn(&check_config_header.step);
 
     const config_header_autoconf_at = b.addConfigHeader(
         .{ .style = .{ .autoconf_at = b.path("autoconf_at/autoconf_at.h.in") } },
@@ -39,7 +38,6 @@ pub fn build(b: *std.Build) void {
             .integer = 42,
             .string = "text",
             .string_at = "@string@",
-
             .underscored_var = "value",
             .at_sign = "@",
         },
@@ -47,8 +45,6 @@ pub fn build(b: *std.Build) void {
     const check_config_header_autoconf_at = b.addCheckFile(config_header_autoconf_at.getOutputFile(), .{
         .expected_exact = @embedFile("autoconf_at/autoconf_at.h"),
     });
-
-    test_step.dependOn(&check_config_header.step);
     test_step.dependOn(&check_config_header_autoconf_at.step);
 
     const config_header_blank = b.addConfigHeader(
@@ -109,7 +105,6 @@ fn addCmakeChecks(b: *std.Build, test_step: *std.Build.Step) void {
             .ONEVAL = 1,
             .TENVAL = 10,
             .STRINGVAL = "test",
-
             .BOOLNOVAL = {},
             .BOOLTRUEVAL = true,
             .BOOLFALSEVAL = false,
-- 
2.54.0