File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -1800,7 +1800,10 @@ impl Build {
18001800 cmd. args ( self . asm_flags . iter ( ) . map ( std:: ops:: Deref :: deref) ) ;
18011801 }
18021802
1803- if compiler. supports_path_delimiter ( ) && !is_assembler_msvc {
1803+ if compiler. supports_path_delimiter ( )
1804+ && !is_assembler_msvc
1805+ && matches ! ( compiler. family, ToolFamily :: Clang { zig_cc: false } )
1806+ {
18041807 // #513: For `clang-cl`, separate flags/options from the input file.
18051808 // When cross-compiling macOS -> Windows, this avoids interpreting
18061809 // common `/Users/...` paths as the `/U` flag and triggering
Original file line number Diff line number Diff line change @@ -103,6 +103,12 @@ impl Tool {
103103 )
104104 . map ( |o| String :: from_utf8_lossy ( & o) . contains ( "ziglang" ) )
105105 . unwrap_or_default ( )
106+ || {
107+ match path. file_name ( ) . map ( OsStr :: to_string_lossy) {
108+ Some ( fname) => fname. contains ( "zig" ) ,
109+ _ => false ,
110+ }
111+ }
106112 }
107113
108114 fn guess_family_from_stdout (
You can’t perform that action at this time.
0 commit comments