Commit 2e74353 1 parent a8c9dc0 commit 2e74353 Copy full SHA for 2e74353
File tree 2 files changed +10
-1
lines changed
2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -1800,7 +1800,10 @@ impl Build {
1800
1800
cmd. args ( self . asm_flags . iter ( ) . map ( std:: ops:: Deref :: deref) ) ;
1801
1801
}
1802
1802
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
+ {
1804
1807
// #513: For `clang-cl`, separate flags/options from the input file.
1805
1808
// When cross-compiling macOS -> Windows, this avoids interpreting
1806
1809
// 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 {
103
103
)
104
104
. map ( |o| String :: from_utf8_lossy ( & o) . contains ( "ziglang" ) )
105
105
. unwrap_or_default ( )
106
+ || {
107
+ match path. file_name ( ) . map ( OsStr :: to_string_lossy) {
108
+ Some ( fname) => fname. contains ( "zig" ) ,
109
+ _ => false ,
110
+ }
111
+ }
106
112
}
107
113
108
114
fn guess_family_from_stdout (
You can’t perform that action at this time.
0 commit comments