Merge pull request #17608 from squeek502/resinator-fixes

resinator: Fix `INCLUDE` var handling and sync with upstream

1 files changed, 12 insertions, 2 deletions

diff --git a/src/Compilation.zig b/src/Compilation.zig
index 596e555411..e15ade5d5b 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -4766,11 +4766,21 @@ 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;
+
+        if (options.preprocess != .yes) {
+            return comp.failWin32Resource(win32_resource, "the '{s}' option is not supported in this context", .{switch (options.preprocess) {
+                .no => "/:no-preprocess",
+                .only => "/p",
+                .yes => unreachable,
+            }});
+        }
+
         var argv = std.ArrayList([]const u8).init(comp.gpa);
         defer argv.deinit();
 
-        // TODO: support options.preprocess == .no and .only
-        //       alternatively, error if those options are used
         try argv.appendSlice(&[_][]const u8{ self_exe_path, "clang" });
 
         try resinator.preprocess.appendClangArgs(arena, &argv, options, .{