diff options
| author | Space Meyer <spm@google.com> | 2023-05-05 14:51:17 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2023-05-26 13:31:19 +0200 |
| commit | b0e6aca75ead7ae3481247c4093f8f579fd23f55 (patch) | |
| tree | 6855da8b7a7c4110e0c5cfb095770603adbe0c1f /pkg | |
| parent | b40ef614f9a2bc5aa16c9271c501851f8bcd0c41 (diff) | |
pkg/vcs: use gcc 10.1 for linux v5.8..v5.16
This was already the case before #3420. Using the default compiler so
far back was overly optimistic, as pointed out in #3814.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/vcs/linux.go | 6 | ||||
| -rw-r--r-- | pkg/vcs/linux_test.go | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkg/vcs/linux.go b/pkg/vcs/linux.go index 2ec37b3b1..29ea05280 100644 --- a/pkg/vcs/linux.go +++ b/pkg/vcs/linux.go @@ -203,9 +203,11 @@ func linuxClangPath(tags map[string]bool, binDir, defaultCompiler string) string func linuxGCCPath(tags map[string]bool, binDir, defaultCompiler string) string { version := "" switch { - case tags["v5.9"]: - // Verified to work with 10.1.0. + case tags["v5.16"]: + // Verified to work with 15.0.7. return defaultCompiler + case tags["v5.9"]: + version = "10.1.0" case tags["v4.12"]: version = "8.1.0" case tags["v4.11"]: diff --git a/pkg/vcs/linux_test.go b/pkg/vcs/linux_test.go index 1865aa2d6..5e81760a2 100644 --- a/pkg/vcs/linux_test.go +++ b/pkg/vcs/linux_test.go @@ -43,7 +43,7 @@ func TestGCCVersion(t *testing.T) { assert.Equal(t, actual, expected, "unexpected gcc path") // Recent tag case. - tags["v5.9"] = true + tags["v5.16"] = true actual = linuxGCCPath(tags, binDir, defaultCompiler) expected = defaultCompiler assert.Equal(t, actual, expected, "unexpected gcc path") |