File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -406,10 +406,14 @@ impl Config {
406
406
// If we're on MSVC we need to be sure to use the right generator or
407
407
// otherwise we won't get 32/64 bit correct automatically.
408
408
// This also guarantees that NMake generator isn't chosen implicitly.
409
+ let using_nmake_generator;
409
410
if self . generator . is_none ( ) {
410
411
cmd. arg ( "-G" ) . arg ( self . visual_studio_generator ( & target) ) ;
412
+ using_nmake_generator = false ;
413
+ } else {
414
+ using_nmake_generator = self . generator . as_ref ( ) . unwrap ( ) == "NMake Makefiles" ;
411
415
}
412
- if target. contains ( "x86_64" ) && !is_ninja {
416
+ if target. contains ( "x86_64" ) && !is_ninja && !using_nmake_generator {
413
417
cmd. arg ( "-Thost=x64" ) ;
414
418
}
415
419
} else if target. contains ( "redox" ) {
You can’t perform that action at this time.
0 commit comments