From 7b4ac31cab7480084f45c2890c4ebd877944bc49 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Mon, 11 Mar 2013 16:50:44 -0400
Subject: [PATCH] cmd/dist: make cc rule match what cmd/go uses

We added -I$GOROOT/pkg/$GOOS_$GOARCH in cmd/go
(I think for use by cgo and swig, primarily) but didn't
update cmd/dist. I was testing some other code and
found that my changes built with cmd/go but failed
during the initial bootstrap. Make them match again.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/7707044
---
 src/cmd/dist/build.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index bac7439e61..30e8b3a550 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -939,6 +939,8 @@ install(char *dir)
 			}
 			vadd(&compile, "-I");
 			vadd(&compile, workdir);
+			vadd(&compile, "-I");
+			vadd(&compile, bprintf(&b, "%s/pkg/%s_%s", goroot, goos, goarch));
 			vadd(&compile, "-D");
 			vadd(&compile, bprintf(&b, "GOOS_%s", goos));
 			vadd(&compile, "-D");
-- 
2.50.0