fix: support activation of old gcc

aminya · Dec 7, 2021 · 9d3670c · 9d3670c
1 parent fa01e81
commit 9d3670c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/dist/setup_cpp.js b/dist/setup_cpp.js
diff --git a/dist/setup_cpp.js.map b/dist/setup_cpp.js.map
diff --git a/src/gcc/gcc.ts b/src/gcc/gcc.ts
@@ -34,20 +34,30 @@ 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 universe'",
+          "ppa:ubuntu-toolchain-r/test",
+        ])
         binDir = (
           await setupAptPack("g++", version, [
-            "ppa:ubuntu-toolchain-r/test",
             "'deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai'",
             "'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 universe'",
+          "ppa:ubuntu-toolchain-r/test",
+        ])
         binDir = (
           await setupAptPack("g++-multilib", version, [
-            "ppa:ubuntu-toolchain-r/test",
             "'deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai'",
             "'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe'",
+            "ppa:ubuntu-toolchain-r/test",
           ])
         ).binDir
       }
@@ -58,9 +68,9 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
     // case "none": {
     //   if (arch === "arm" || arch === "arm64") {
     //     return setupAptPack("gcc-arm-none-eabi", version, [
-    //       "ppa:ubuntu-toolchain-r/test",
     //       "'deb http://dk.archive.ubuntu.com/ubuntu/ xenial mai'",
     //       "'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe'",
+    //       "ppa:ubuntu-toolchain-r/test",
     //     ])
     //   } else {
     //     throw new Error(`Unsupported platform for ${arch}`)
@@ -78,8 +88,6 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
 }
 
 async function activateGcc(version: string, binDir: string) {
-  const majorVersion = semverMajor(semverCoerce(version) ?? version)
-
   // TODO
   // const ld = process.env.LD_LIBRARY_PATH ?? ""
   // const dyld = process.env.DYLD_LIBRARY_PATH ?? ""
@@ -93,8 +101,14 @@ async function activateGcc(version: string, binDir: string) {
     exportVariable("CC", `${binDir}/gcc`)
     exportVariable("CXX", `${binDir}/g++`)
   } else {
-    exportVariable("CC", `${binDir}/gcc-${majorVersion}`)
-    exportVariable("CXX", `${binDir}/g++-${majorVersion}`)
+    const majorVersion = semverMajor(semverCoerce(version) ?? version)
+    if (majorVersion >= 5) {
+      exportVariable("CC", `${binDir}/gcc-${majorVersion}`)
+      exportVariable("CXX", `${binDir}/g++-${majorVersion}`)
+    } else {
+      exportVariable("CC", `${binDir}/gcc-${version}`)
+      exportVariable("CXX", `${binDir}/g++-${version}`)
+    }
   }
 
   await setupMacOSSDK()