File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -430,12 +430,20 @@ class VisualStudioFinder {
430
430
431
431
// Helper - process toolset information
432
432
getToolset ( info , versionYear ) {
433
- const vcTools = process . arch === 'arm64' ? 'VC.Tools.ARM64' : 'VC.Tools.x86.x64'
434
- const pkg = `Microsoft.VisualStudio.Component.${ vcTools } `
433
+ const vcToolsArm64 = 'VC.Tools.ARM64' ;
434
+ const pkgArm64 = `Microsoft.VisualStudio.Component.${ vcToolsArm64 } `
435
+ const vcToolsX64 = 'VC.Tools.x86.x64' ;
436
+ const pkgX64 = `Microsoft.VisualStudio.Component.${ vcToolsX64 } `
435
437
const express = 'Microsoft.VisualStudio.WDExpress'
436
438
437
- if ( info . packages . indexOf ( pkg ) !== - 1 ) {
438
- this . log . silly ( `- found ${ vcTools } ` )
439
+ if ( process . arch === 'arm64' && info . packages . indexOf ( pkgArm64 ) ) {
440
+ this . log . silly ( `- found ${ vcToolsArm64 } ` )
441
+ } else if ( info . packages . indexOf ( pkg ) !== - 1 ) {
442
+ if ( process . arch === 'arm64' ) {
443
+ this . log . addLog ( `- found ${ vcToolsX64 } on ARM64 platform. Expect less performance and/or link failure with ARM64 binary.` )
444
+ } else {
445
+ this . log . silly ( `- found ${ vcToolsX64 } ` )
446
+ }
439
447
} else if ( info . packages . indexOf ( express ) !== - 1 ) {
440
448
this . log . silly ( '- found Visual Studio Express (looking for toolset)' )
441
449
} else {
You can’t perform that action at this time.
0 commit comments