fix: fix old gcc ppa

This commit is contained in:
Amin Yahyaabadi 2021-12-07 14:16:22 -06:00
parent 95c8ebb90c
commit 90a15f5705
3 changed files with 7 additions and 7 deletions

2
dist/setup_cpp.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -35,13 +35,13 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
case "linux": { case "linux": {
if (arch === "x64") { if (arch === "x64") {
await setupAptPack("gcc", version, [ await setupAptPack("gcc", version, [
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
"ppa:ubuntu-toolchain-r/test", "ppa:ubuntu-toolchain-r/test",
]) ])
binDir = ( binDir = (
await setupAptPack("g++", version, [ await setupAptPack("g++", version, [
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
"ppa:ubuntu-toolchain-r/test", "ppa:ubuntu-toolchain-r/test",
]) ])
@ -49,13 +49,13 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
} else { } else {
info(`Install g++-multilib because gcc for ${arch} was requested`) info(`Install g++-multilib because gcc for ${arch} was requested`)
await setupAptPack("gcc-multilib", version, [ await setupAptPack("gcc-multilib", version, [
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
"ppa:ubuntu-toolchain-r/test", "ppa:ubuntu-toolchain-r/test",
]) ])
binDir = ( binDir = (
await setupAptPack("g++-multilib", version, [ await setupAptPack("g++-multilib", version, [
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe", "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
"ppa:ubuntu-toolchain-r/test", "ppa:ubuntu-toolchain-r/test",
]) ])
@ -68,7 +68,7 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
// case "none": { // case "none": {
// if (arch === "arm" || arch === "arm64") { // if (arch === "arm" || arch === "arm64") {
// return setupAptPack("gcc-arm-none-eabi", version, [ // return setupAptPack("gcc-arm-none-eabi", version, [
// "deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai", // "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
// "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe", // "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
// "ppa:ubuntu-toolchain-r/test", // "ppa:ubuntu-toolchain-r/test",
// ]) // ])