Skip to content

Commit

Permalink
fix: fix old gcc ppa
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Dec 7, 2021
1 parent 95c8ebb commit 90a15f5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/setup_cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/setup_cpp.js.map

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/gcc/gcc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
case "linux": {
if (arch === "x64") {
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",
"ppa:ubuntu-toolchain-r/test",
])
binDir = (
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",
"ppa:ubuntu-toolchain-r/test",
])
).binDir
} else {
info(`Install g++-multilib because gcc for ${arch} was requested`)
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",
"ppa:ubuntu-toolchain-r/test",
])
binDir = (
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",
"ppa:ubuntu-toolchain-r/test",
])
Expand All @@ -68,7 +68,7 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
// case "none": {
// if (arch === "arm" || arch === "arm64") {
// 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",
// "ppa:ubuntu-toolchain-r/test",
// ])
Expand Down

0 comments on commit 90a15f5

Please sign in to comment.