2 files changed, 15 insertions, 1 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 9e4d1e3c22..366612cdd1 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -929,6 +929,8 @@ func install(dir string) {
 				compile = append(compile,
 					"-D", fmt.Sprintf("GOOS=%q", goos),
 					"-D", fmt.Sprintf("GOARCH=%q", goarch),
+					"-D", fmt.Sprintf("GOHOSTOS=%q", gohostos),
+					"-D", fmt.Sprintf("GOHOSTARCH=%q", gohostarch),
 					"-D", fmt.Sprintf("GOROOT=%q", goroot_final),
 					"-D", fmt.Sprintf("GOVERSION=%q", goversion),
 					"-D", fmt.Sprintf("GOARM=%q", goarm),
diff --git a/src/lib9/goos.c b/src/lib9/goos.c
index 2d4a800dd1..68b94d6114 100644
--- a/src/lib9/goos.c
+++ b/src/lib9/goos.c
@@ -52,8 +52,20 @@ getgo386(void)
 	return defgetenv("GO386", GO386);
 }
 
-char *
+char*
 getgoextlinkenabled(void)
 {
 	return GO_EXTLINK_ENABLED;
 }
+
+char*
+getgohostarch(void)
+{
+	return GOHOSTARCH;
+}
+
+char*
+getgohostos(void)
+{
+	return GOHOSTOS;
+}