env: convert linux-x86-clang to be VM-based

Change-Id: I583d751652dec9176169b4d4705f3813506017e3
Reviewed-on: https://go-review.googlesource.com/4790
Reviewed-by: Minux Ma <minux@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 076d564..e0381d9 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -175,11 +175,9 @@
 		tool:    "gccgo",
 	})
 
-	// TODO(bradfitz,adg,jbd): convert these (sid, clang, nacl) to VMs too:
+	// TODO(bradfitz,adg,jbd): convert these (sid, nacl) to VMs too:
 	addBuilder(BuildConfig{Name: "linux-386-sid", Image: "gobuilders/linux-x86-sid"})
 	addBuilder(BuildConfig{Name: "linux-amd64-sid", Image: "gobuilders/linux-x86-sid"})
-	addBuilder(BuildConfig{Name: "linux-386-clang", Image: "gobuilders/linux-x86-clang"})
-	addBuilder(BuildConfig{Name: "linux-amd64-clang", Image: "gobuilders/linux-x86-clang"})
 	addBuilder(BuildConfig{Name: "nacl-386"})
 	addBuilder(BuildConfig{Name: "nacl-amd64p32"})
 
@@ -259,6 +257,17 @@
 		env:         []string{"GOROOT_BOOTSTRAP=/go1.4"},
 	})
 	addBuilder(BuildConfig{
+		Name:        "linux-386-clang",
+		VMImage:     "linux-buildlet-clang",
+		buildletURL: "http://storage.googleapis.com/go-builder-data/buildlet.linux-amd64",
+		env:         []string{"GOROOT_BOOTSTRAP=/go1.4", "CC=/usr/bin/clang"},
+	})
+	addBuilder(BuildConfig{
+		Name:    "linux-amd64-clang",
+		VMImage: "linux-buildlet-clang",
+		env:     []string{"GOROOT_BOOTSTRAP=/go1.4", "CC=/usr/bin/clang"},
+	})
+	addBuilder(BuildConfig{
 		Name:        "openbsd-amd64-gce56",
 		VMImage:     "openbsd-amd64-56",
 		machineType: "n1-highcpu-2",