Skip to content

Commit d5cf571

Browse files
authored
Merge pull request #172 from aminya/mingw [skip ci]
2 parents 0fbc8e4 + b4b0e08 commit d5cf571

File tree

8 files changed

+24
-8
lines changed

8 files changed

+24
-8
lines changed

cspell.config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ignorePaths:
1111
- "**/node_modules/"
1212
words:
1313
- aarch
14+
- clangd
1415
- aminya
1516
- applellvm
1617
- bazel

dist/node12/setup-cpp.js

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/node12/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/node16/setup-cpp.js

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/node16/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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ interface MingwInfo {
2525

2626
// https://github.com/brechtsanders/winlibs_mingw/releases
2727
const GccToMingwInfo = {
28-
"12": { releaseName: "12.2.0-14.0.6-10.0.0-ucrt-r2", fileSuffix: "12.2.0-mingw-w64ucrt-10.0.0-r2" },
28+
"13": { releaseName: "13.1.0posix-16.0.3-11.0.0-ucrt-r1", fileSuffix: "13.1.0-mingw-w64ucrt-11.0.0-r1" },
29+
"13.1-ucrt": { releaseName: "13.1.0posix-16.0.3-11.0.0-ucrt-r1", fileSuffix: "13.1.0-mingw-w64ucrt-11.0.0-r1" },
30+
"13.1-msvcrt": { releaseName: "13.1.0posix-16.0.3-11.0.0-msvcrt-r1", fileSuffix: "13.1.0-mingw-w64msvcrt-11.0.0-r1" },
31+
"12": { releaseName: "12.3.0-16.0.4-11.0.0-ucrt-r1", fileSuffix: "12.3.0-mingw-w64ucrt-11.0.0-r1" },
32+
"12.3.0-ucrt": { releaseName: "12.3.0-16.0.4-11.0.0-ucrt-r1", fileSuffix: "12.3.0-mingw-w64ucrt-11.0.0-r1" },
33+
"12.3.0-msvcrt": { releaseName: "12.3.0-16.0.4-11.0.0-msvcrt-r1", fileSuffix: "12.3.0-mingw-w64msvcrt-11.0.0-r1" },
2934
"12.2.0-ucrt": { releaseName: "12.2.0-14.0.6-10.0.0-ucrt-r2", fileSuffix: "12.2.0-mingw-w64ucrt-10.0.0-r2" },
3035
"12.2.0-msvcrt": { releaseName: "12.2.0-14.0.6-10.0.0-msvcrt-r2", fileSuffix: "12.2.0-mingw-w64msvcrt-10.0.0-r2" },
3136
"12.1.0-ucrt": { releaseName: "12.1.0-14.0.4-10.0.0-ucrt-r2", fileSuffix: "12.1.0-mingw-w64ucrt-10.0.0-r2" },

src/llvm/llvm_url.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ export const VERSIONS: Set<string> = getVersions([
6565
"16.0.0",
6666
"16.0.1",
6767
"16.0.2",
68+
"16.0.3",
69+
"16.0.4",
6870
])
6971

7072
/** The LLVM versions that were never released for the Windows platform. */
@@ -93,6 +95,8 @@ const DARWIN_MISSING = new Set([
9395
"16.0.0",
9496
"16.0.1",
9597
"16.0.2",
98+
"16.0.3",
99+
"16.0.4",
96100
])
97101

98102
/**
@@ -152,6 +156,8 @@ const UBUNTU_SUFFIX_MAP: { [key: string]: string } = {
152156
"15.0.6": "-ubuntu-18.04",
153157
"16.0.0": "-ubuntu-18.04",
154158
"16.0.2": "-ubuntu-22.04",
159+
"16.0.3": "-ubuntu-22.04",
160+
"16.0.4": "-ubuntu-22.04",
155161
}
156162

157163
/** The latest supported LLVM version for the Linux (Ubuntu) platform. */

src/utils/setup/version.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ export async function getSpecificVersionAndUrl(
4949

5050
// if the given set doesn't include the version, throw an error
5151
if (!versions.has(version)) {
52-
throw new Error(`Unsupported target! (platform='${platform}', version='${version}')`)
52+
throw new Error(
53+
`Unsupported target! (platform='${platform}', version='${version}'). Try one of the following: ${JSON.stringify(
54+
versions
55+
)}`
56+
)
5357
}
5458

5559
const offlineUrls: string[] = []
@@ -68,8 +72,8 @@ export async function getSpecificVersionAndUrl(
6872
}
6973

7074
throw new Error(
71-
`Unsupported target! (platform='${platform}', version='${version}'). The offline urls tested:\n${offlineUrls.join(
72-
"\n"
75+
`Unsupported target! (platform='${platform}', version='${version}'). Try one of the following: ${JSON.stringify(
76+
versions
7377
)}`
7478
)
7579
}

0 commit comments

Comments
 (0)