cmd/dist: correct default C++ compiler when using gcc

Fixes #22609

Change-Id: Ic948345e7d1623a7defee6a6493eb81fe7393111
Reviewed-on: https://go-review.googlesource.com/76396
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 675989ea9fca17f690723cf1a4f331fe1700ca01..9b2aac6225a7abb6436e35561787ba19d352cf20 100644 (file)
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -171,12 +171,12 @@ func xinit() {
 
        gogcflags = os.Getenv("BOOT_GO_GCFLAGS")
 
-       cc := "gcc"
+       cc, cxx := "gcc", "g++"
        if defaultclang {
-               cc = "clang"
+               cc, cxx = "clang", "clang++"
        }
        defaultcc = compilerEnv("CC", cc)
-       defaultcxx = compilerEnv("CXX", cc+"++")
+       defaultcxx = compilerEnv("CXX", cxx)
 
        defaultcflags = os.Getenv("CFLAGS")
        defaultldflags = os.Getenv("LDFLAGS")