Skip to content

Commit a45740c

Browse files
committed
fix: fix default gcc version + fix Mingw arch
1 parent 11fad2b commit a45740c

File tree

9 files changed

+16
-12
lines changed

9 files changed

+16
-12
lines changed

dist/actions/setup-cpp.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gcc/gcc.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ async function getGccPackageInfo(version: string, platform: NodeJS.Platform, arc
3131
mingwAssets,
3232
{
3333
version,
34-
arch,
34+
arch: arch === "x64"
35+
? "x86_64"
36+
: arch === "ia32"
37+
? "i386"
38+
: arch,
3539
filterName: (name) => name.endsWith(".7z"),
3640
},
3741
)

src/versions/default_versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const DefaultVersions: Record<string, string | undefined> = {
3232
doxygen: isArch() ? "1.11.0-4" : "1.11.0", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
3333
gcc: process.platform === "win32"
3434
? "14.2.0posix-18.1.8-12.0.0-ucrt-r1"
35-
: undefined, // use the default version on Ubuntu, Fedora, Arch, macOS, etc.
35+
: "", // use the default version on Ubuntu, Fedora, Arch, macOS, etc.
3636
// mingw: isArch() ? "12.2.0-1" : "8", // https://archlinux.org/packages/extra/x86_64/mingw-w64-gcc/
3737
powershell: "7.4.5", // https://github.com/PowerShell/PowerShell/releases/tag/v7.4.5
3838
}

src/versions/versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function getVersion(name: string, version: string | undefined, osVersion:
77
if (isVersionDefault(version) && process.platform === "linux" && osVersion !== null && name in DefaultLinuxVersion) {
88
return getDefaultLinuxVersion(osVersion, DefaultLinuxVersion[name]!)
99
} else if (isVersionDefault(version) && name in DefaultVersions) {
10-
return DefaultVersions[name]!
10+
return DefaultVersions[name] ?? ""
1111
} else if (version === "true") {
1212
return ""
1313
}

0 commit comments

Comments
 (0)