Was never working correctly when executing from the command-line.

R=r
CC=golang-dev
https://golang.org/cl/5236042