From 81a61c8ecd7a970dc96a6068cf8587fd81ebd6e4 Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Wed, 18 Oct 2023 18:00:50 -0700
Subject: Sync resinator with upstream and fix INCLUDE env var handling

The INCLUDE variable being used during `.rc` preprocessing was an accidental regression in https://github.com/ziglang/zig/pull/17412.
Closes #17585.

resinator changes:
source_mapping: Protect against NUL bytes in #line filenames
lex: Avoid recalculating column on every tab stop within string literals
Proper error handling for failing to open cwd instead of `catch unreachable`
Use platform-specific delimiter for INCLUDE env var parsing
---
 src/Compilation.zig | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/Compilation.zig')

diff --git a/src/Compilation.zig b/src/Compilation.zig
index 8032e67943..5f9448c50f 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -4755,6 +4755,10 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
         };
         defer options.deinit();
 
+        // We never want to read the INCLUDE environment variable, so
+        // unconditionally set `ignore_include_env_var` to true
+        options.ignore_include_env_var = true;
+
         var argv = std.ArrayList([]const u8).init(comp.gpa);
         defer argv.deinit();
 
-- 
cgit v1.2.3