diff --git a/dev-lang/go/go-1.15.7-r1.ebuild b/dev-lang/go/go-1.15.7-r2.ebuild
similarity index 100%
rename from dev-lang/go/go-1.15.7-r1.ebuild
rename to dev-lang/go/go-1.15.7-r2.ebuild
diff --git a/dev-lang/go/go-1.15.7.ebuild b/dev-lang/go/go-1.15.7.ebuild
index 849a9b5..d81562e 100644
--- a/dev-lang/go/go-1.15.7.ebuild
+++ b/dev-lang/go/go-1.15.7.ebuild
@@ -72,9 +72,15 @@
 
 	cd "${S}/src"
 	einfo "Building the cross compiler for ${CTARGET}."
-	GOOS="linux" GOARCH="$(get_goarch ${CTARGET})" CGO_ENABLED="1" \
-		CC_FOR_TARGET="$(tc-getTARGET_CC)" \
-		CXX_FOR_TARGET="$(tc-getTARGET_CXX)" \
+	local go_target_cc="$(tc-getTARGET_CC)"
+	local go_target_cxx="$(tc-getTARGET_CXX)"
+	if [[ "$(tc-arch "${CBUILD}")" == "$(tc-arch "${CTARGET}")" ]]; then
+		go_target_cc="$(tc-getBUILD_CC)"
+		go_target_cxx="$(tc-getBUILD_CXX)"
+	fi
+	GOOS="linux" GOARCH="$(get_goarch "${CTARGET}")" CGO_ENABLED="1" \
+		CC_FOR_TARGET="${go_target_cc}" \
+		CXX_FOR_TARGET="${go_target_cxx}" \
 		./make.bash || die
 
 	if is_cross ; then