File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -1171,6 +1171,11 @@ impl Build {
1171
1171
atlmfc_lib. display( )
1172
1172
) ) ;
1173
1173
}
1174
+
1175
+ if compiler. family == ToolFamily :: Clang {
1176
+ // Mirror what clang does at link stage
1177
+ self . print ( & format_args ! ( "cargo:rustc-link-arg=-defaultlib:oldnames" ) ) ;
1178
+ }
1174
1179
}
1175
1180
1176
1181
if self . link_lib_modifiers . is_empty ( ) {
@@ -1712,13 +1717,6 @@ impl Build {
1712
1717
cmd. push_opt_unless_duplicate ( format ! ( "-O{}" , opt_level) . into ( ) ) ;
1713
1718
}
1714
1719
1715
- if cmd. family == ToolFamily :: Clang && target. contains ( "windows" ) {
1716
- // Disambiguate mingw and msvc on Windows. Problem is that
1717
- // depending on the origin clang can default to a mismatchig
1718
- // run-time.
1719
- cmd. push_cc_arg ( format ! ( "--target={}" , target) . into ( ) ) ;
1720
- }
1721
-
1722
1720
if cmd. family == ToolFamily :: Clang && target. contains ( "android" ) {
1723
1721
// For compatibility with code that doesn't use pre-defined `__ANDROID__` macro.
1724
1722
// If compiler used via ndk-build or cmake (officially supported build methods)
You can’t perform that action at this time.
0 commit comments