From: Russ Cox <rsc@golang.org>
Date: Fri, 2 Aug 2013 19:13:06 +0000 (-0400)
Subject: cmd/dist: fix build
X-Git-Tag: go1.2rc2~816
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e6ddddadda8e578838c7d8f692791ea74423b161;p=gostls13.git

cmd/dist: fix build

TBR=bradfitz
CC=golang-dev
https://golang.org/cl/12369043
---

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index af665c5480..4012744a58 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -589,7 +589,7 @@ static void
 install(char *dir)
 {
 	char *name, *p, *elem, *prefix, *exe;
-	bool islib, ispkg, isgo, stale, clang;
+	bool islib, ispkg, isgo, stale;
 	Buf b, b1, path;
 	Vec compile, files, link, go, missing, clean, lib, extra;
 	Time ttarg, t;
@@ -639,7 +639,7 @@ install(char *dir)
 		splitfields(&gccargs, bstr(&b));
 		for(i=0; i<nelem(proto_gccargs); i++)
 			vadd(&gccargs, proto_gccargs[i]);
-		if(clang) {
+		if(contains(gccargs.p[0], "clang")) {
 			// disable ASCII art in clang errors, if possible
 			vadd(&gccargs, "-fno-caret-diagnostics");
 			// clang is too smart about unused command-line arguments