File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -14,4 +14,4 @@ A build dependency for running `cmake` to build a native library
14
14
categories = [" development-tools::build-utils" ]
15
15
16
16
[dependencies ]
17
- cc = " 1.0"
17
+ cc = " 1.0.32 "
Original file line number Diff line number Diff line change @@ -415,6 +415,7 @@ impl Config {
415
415
}
416
416
if target. contains ( "x86_64" ) && !is_ninja && !using_nmake_generator {
417
417
cmd. arg ( "-Thost=x64" ) ;
418
+ cmd. arg ( "-DCMAKE_GENERATOR_PLATFORM=x64" ) ;
418
419
}
419
420
} else if target. contains ( "redox" ) {
420
421
if !self . defined ( "CMAKE_SYSTEM_NAME" ) {
@@ -706,6 +707,7 @@ impl Config {
706
707
use cc:: windows_registry:: { find_vs_version, VsVers } ;
707
708
708
709
let base = match find_vs_version ( ) {
710
+ Ok ( VsVers :: Vs16 ) => "Visual Studio 16 2019" ,
709
711
Ok ( VsVers :: Vs15 ) => "Visual Studio 15 2017" ,
710
712
Ok ( VsVers :: Vs14 ) => "Visual Studio 14 2015" ,
711
713
Ok ( VsVers :: Vs12 ) => "Visual Studio 12 2013" ,
@@ -716,10 +718,8 @@ impl Config {
716
718
) ,
717
719
Err ( msg) => panic ! ( msg) ,
718
720
} ;
719
- if target. contains ( "i686" ) {
721
+ if target. contains ( "i686" ) || target . contains ( "x86_64" ) {
720
722
base. to_string ( )
721
- } else if target. contains ( "x86_64" ) {
722
- format ! ( "{} Win64" , base)
723
723
} else {
724
724
panic ! ( "unsupported msvc target: {}" , target) ;
725
725
}
You can’t perform that action at this time.
0 commit comments