$OpenBSD: patch-src_cmd_go_internal_work_build_go,v 1.1 2017/09/03 15:42:25 jsing Exp $

Index: src/cmd/go/internal/work/build.go
--- src/cmd/go/internal/work/build.go.orig
+++ src/cmd/go/internal/work/build.go
@@ -3165,10 +3165,12 @@ func (b *Builder) ccompilerCmd(envvar, defcmd, objdir 
 		}
 	}
 
-	if strings.Contains(a[0], "clang") {
-		// disable ASCII art in clang errors, if possible
+	// disable ASCII art in clang errors, if possible
+	if b.gccSupportsFlag("-fno-caret-diagnostics") {
 		a = append(a, "-fno-caret-diagnostics")
-		// clang is too smart about command-line arguments
+	}
+	// clang is too smart about command-line arguments
+	if b.gccSupportsFlag("-Qunused-arguments") {
 		a = append(a, "-Qunused-arguments")
 	}
 
