@@ -1337,17 +1337,15 @@ impl Build {
1337
1337
1338
1338
let mut cmd = compiler. to_command ( ) ;
1339
1339
let is_arm = matches ! ( target. arch, "aarch64" | "arm" ) ;
1340
- let clang = compiler. is_like_clang ( ) ;
1341
- let gnu = compiler. family == ToolFamily :: Gnu ;
1342
1340
command_add_output_file (
1343
1341
& mut cmd,
1344
1342
& obj,
1345
1343
CmdAddOutputFileArgs {
1346
1344
cuda : self . cuda ,
1347
1345
is_assembler_msvc : false ,
1348
1346
msvc : compiler. is_like_msvc ( ) ,
1349
- clang,
1350
- gnu,
1347
+ clang : compiler . is_like_clang ( ) ,
1348
+ gnu : compiler . is_like_gnu ( ) ,
1351
1349
is_asm : false ,
1352
1350
is_arm,
1353
1351
} ,
@@ -1366,7 +1364,7 @@ impl Build {
1366
1364
cmd. env ( "_LINK_" , "-entry:main" ) ;
1367
1365
}
1368
1366
1369
- let output = cmd. output ( ) ?;
1367
+ let output = cmd. current_dir ( out_dir ) . output ( ) ?;
1370
1368
let is_supported = output. status . success ( ) && output. stderr . is_empty ( ) ;
1371
1369
1372
1370
self . build_cache
@@ -1749,8 +1747,6 @@ impl Build {
1749
1747
let target = self . get_target ( ) ?;
1750
1748
let msvc = target. env == "msvc" ;
1751
1749
let compiler = self . try_get_compiler ( ) ?;
1752
- let clang = compiler. is_like_clang ( ) ;
1753
- let gnu = compiler. family == ToolFamily :: Gnu ;
1754
1750
1755
1751
let is_assembler_msvc = msvc && asm_ext == Some ( AsmFileExt :: DotAsm ) ;
1756
1752
let mut cmd = if is_assembler_msvc {
@@ -1770,8 +1766,8 @@ impl Build {
1770
1766
cuda : self . cuda ,
1771
1767
is_assembler_msvc,
1772
1768
msvc : compiler. is_like_msvc ( ) ,
1773
- clang,
1774
- gnu,
1769
+ clang : compiler . is_like_clang ( ) ,
1770
+ gnu : compiler . is_like_gnu ( ) ,
1775
1771
is_asm,
1776
1772
is_arm,
1777
1773
} ,
0 commit comments