diff options
| author | Ryan Liptak <squeek502@hotmail.com> | 2023-10-18 18:00:50 -0700 |
|---|---|---|
| committer | Ryan Liptak <squeek502@hotmail.com> | 2023-10-18 18:30:32 -0700 |
| commit | 81a61c8ecd7a970dc96a6068cf8587fd81ebd6e4 (patch) | |
| tree | 5f01df7d4b47a48bd25e505457a4fd0cf51d41b6 /src/Compilation.zig | |
| parent | 32bc077672cc3d7c468b4531c52d160ee12fb89f (diff) | |
| download | zig-81a61c8ecd7a970dc96a6068cf8587fd81ebd6e4.tar.gz zig-81a61c8ecd7a970dc96a6068cf8587fd81ebd6e4.zip | |
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
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 4 |
1 files changed, 4 insertions, 0 deletions
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(); |