aboutsummaryrefslogtreecommitdiffstats
path: root/client/go
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-19 13:11:45 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-01-19 13:16:23 +0000
commita7e9ada4ee7040b47f00dfe72f47b90b4b31f37f (patch)
tree12fb0c591142dbecab69201ef62ad0b96f76cd90 /client/go
parentd835d7d9955da1d62a25a2453a92b895d9bd2921 (diff)
Upgrade to gcc 12
Diffstat (limited to 'client/go')
-rw-r--r--client/go/script-utils/startcbinary/common_env.go2
-rw-r--r--client/go/vespa/load_env.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/client/go/script-utils/startcbinary/common_env.go b/client/go/script-utils/startcbinary/common_env.go
index eadb0aafb1b..eee7500f5d2 100644
--- a/client/go/script-utils/startcbinary/common_env.go
+++ b/client/go/script-utils/startcbinary/common_env.go
@@ -70,7 +70,7 @@ func (spec *ProgSpec) configureUseMadvise() {
func (spec *ProgSpec) configurePath() {
// Prefer newer gdb and pstack:
- spec.prependPath("/opt/rh/gcc-toolset-11/root/usr/bin")
+ spec.prependPath("/opt/rh/gcc-toolset-12/root/usr/bin")
// Maven is needed for tester applications:
spec.prependPath(vespa.FindHome() + "/local/maven/bin")
spec.prependPath(vespa.FindHome() + "/bin64")
diff --git a/client/go/vespa/load_env.go b/client/go/vespa/load_env.go
index 5c216c12c31..3c73f7aaf53 100644
--- a/client/go/vespa/load_env.go
+++ b/client/go/vespa/load_env.go
@@ -17,7 +17,7 @@ import (
)
const (
- CURRENT_GCC_TOOLSET = "/opt/rh/gcc-toolset-11/root/usr/bin"
+ CURRENT_GCC_TOOLSET = "/opt/rh/gcc-toolset-12/root/usr/bin"
)
// backwards-compatible parsing of default-env.txt
@@ -290,7 +290,7 @@ func ensureGoodPath(receiver loadEnvReceiver) {
builder.appendPath(FindHome() + "/bin")
builder.appendPath(FindHome() + "/bin64")
// Prefer newer gdb and pstack:
- builder.appendPath("/opt/rh/gcc-toolset-11/root/usr/bin")
+ builder.appendPath("/opt/rh/gcc-toolset-12/root/usr/bin")
// how to find the "java" program?
if javaHome := os.Getenv(envvars.JAVA_HOME); javaHome != "" {
builder.appendPath(javaHome + "/bin")