Skip to content

Commit 69b7a71

Browse files
committed
fix: do not add xenial toolchain
1 parent 4366b4c commit 69b7a71

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

dist/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/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: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,11 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
3636
}
3737
case "linux": {
3838
if (arch === "x64") {
39-
setupAptPack("gcc", version, [
40-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
41-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
42-
"ppa:ubuntu-toolchain-r/test",
43-
])
39+
setupAptPack("gcc", version, ["ppa:ubuntu-toolchain-r/test"])
4440
binDir = setupAptPack("g++", version, []).binDir
4541
} else {
4642
info(`Install g++-multilib because gcc for ${arch} was requested`)
47-
setupAptPack("gcc-multilib", version, [
48-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
49-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
50-
"ppa:ubuntu-toolchain-r/test",
51-
])
43+
setupAptPack("gcc-multilib", version, ["ppa:ubuntu-toolchain-r/test"])
5244
binDir = setupAptPack("g++-multilib", version, []).binDir
5345
}
5446
break
@@ -58,8 +50,6 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
5850
// case "none": {
5951
// if (arch === "arm" || arch === "arm64") {
6052
// return setupAptPack("gcc-arm-none-eabi", version, [
61-
// "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
62-
// "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
6353
// "ppa:ubuntu-toolchain-r/test",
6454
// ])
6555
// } else {

0 commit comments

Comments
 (0)