From 19cc9f91fa233e6846cbb582e26c31fa9748730d Mon Sep 17 00:00:00 2001
From: Dave Cheney <dave@cheney.net>
Date: Thu, 4 Apr 2013 16:13:29 +1100
Subject: [PATCH] doc/go1.1.html: mention cgo and cross compilation

R=r, minux.ma, bradfitz
CC=golang-dev
https://golang.org/cl/8304043
---
 doc/go1.1.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/go1.1.html b/doc/go1.1.html
index 6564b8f75d..fac922910a 100644
--- a/doc/go1.1.html
+++ b/doc/go1.1.html
@@ -420,6 +420,17 @@ An ARMv6 or later processor is required for <code>freebsd/arm</code> or
 Go 1.1 adds experimental support for <code>cgo</code> on <code>linux/arm</code>.
 </p>
 
+<h3 id="crosscompile">Cross compilation</h3>
+
+<p>
+When cross-compiling, the <code>go</code> tool will disable <code>cgo</code>
+support by default.
+</p>
+
+<p>
+To explicitly enable <code>cgo</code>, set <code>CGO_ENABLED=1</code>.
+</p>
+
 <h2 id="performance">Performance</h2>
 
 <p>
-- 
2.50.0