File tree 2 files changed +7
-2
lines changed
2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -1800,7 +1800,7 @@ 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 ( ) && !is_assembler_msvc && matches ! ( compiler . family , ToolFamily :: Clang { zig_cc : false } ) {
1804
1804
// #513: For `clang-cl`, separate flags/options from the input file.
1805
1805
// When cross-compiling macOS -> Windows, this avoids interpreting
1806
1806
// common `/Users/...` paths as the `/U` flag and triggering
Original file line number Diff line number Diff line change @@ -102,7 +102,12 @@ impl Tool {
102
102
cargo_output,
103
103
)
104
104
. map ( |o| String :: from_utf8_lossy ( & o) . contains ( "ziglang" ) )
105
- . unwrap_or_default ( )
105
+ . unwrap_or_default ( ) || {
106
+ match path. file_name ( ) . map ( OsStr :: to_string_lossy) {
107
+ Some ( fname) => fname. contains ( "zig" ) ,
108
+ _ => false ,
109
+ }
110
+ }
106
111
}
107
112
108
113
fn guess_family_from_stdout (
You can’t perform that action at this time.
0 commit comments