@@ -19,16 +19,7 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
19
19
if ( arch === "arm" || arch === "arm64" ) {
20
20
await setupChocoPack ( "gcc-arm-embedded" , version )
21
21
}
22
- await setupChocoPack ( "mingw" , version )
23
- if ( arch === "x64" && existsSync ( "C:/tools/mingw64/bin" ) ) {
24
- binDir = "C:/tools/mingw64/bin"
25
- await addPath ( binDir )
26
- } else if ( arch === "ia32" && existsSync ( "C:/tools/mingw32/bin" ) ) {
27
- binDir = "C:/tools/mingw32/bin"
28
- await addPath ( binDir )
29
- } else if ( existsSync ( `${ process . env . ChocolateyInstall ?? "C:/ProgramData/chocolatey" } /bin/g++.exe` ) ) {
30
- binDir = `${ process . env . ChocolateyInstall ?? "C:/ProgramData/chocolatey" } /bin`
31
- }
22
+ binDir = await setupChocoMingw ( version , arch )
32
23
break
33
24
}
34
25
case "darwin" : {
@@ -68,6 +59,21 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
68
59
return undefined
69
60
}
70
61
62
+ async function setupChocoMingw ( version : string , arch : string ) {
63
+ await setupChocoPack ( "mingw" , version )
64
+ let binDir : string | undefined
65
+ if ( arch === "x64" && existsSync ( "C:/tools/mingw64/bin" ) ) {
66
+ binDir = "C:/tools/mingw64/bin"
67
+ await addPath ( binDir )
68
+ } else if ( arch === "ia32" && existsSync ( "C:/tools/mingw32/bin" ) ) {
69
+ binDir = "C:/tools/mingw32/bin"
70
+ await addPath ( binDir )
71
+ } else if ( existsSync ( `${ process . env . ChocolateyInstall ?? "C:/ProgramData/chocolatey" } /bin/g++.exe` ) ) {
72
+ binDir = `${ process . env . ChocolateyInstall ?? "C:/ProgramData/chocolatey" } /bin`
73
+ }
74
+ return binDir
75
+ }
76
+
71
77
async function activateGcc ( version : string , binDir : string ) {
72
78
const promises : Promise < void > [ ] = [ ]
73
79
// Setup gcc as the compiler
0 commit comments