Commit Graph

6 Commits

Author SHA1 Message Date
Davanum Srinivas
0cf59707bd Ignore GREP_OPTIONS/GREP_COLOR
On OSX - default BSD grep breaks gen_conversion. Let's just
make sure we use --color=never everywhere, so we don't trip
over GREP_OPTIONS/GREP_COLOR in a user environment.

Fixes #29013
2016-07-16 20:28:30 -04:00
k8s-merge-robot
d7c17ca94c Merge pull request #29016 from thockin/fix-makefile-line-continuations
Automatic merge from submit-queue

Fix make to include line-continuations

This got broken in recent changes.  Sorry for the noise.
2016-07-15 13:00:09 -07:00
Tim Hockin
31badf0ab8 Fix make to include line-continuations 2016-07-15 10:19:58 -07:00
Tim Hockin
2a4495cf89 Allow make to run from outside GOPATH 2016-07-15 08:42:12 -07:00
Manuel de Brito Fontes
d3d569315c Fix make on Mac replacing sed with tr 2016-07-14 21:01:45 -04:00
Tim Hockin
0fc46afda6 Move make logic for generated files into a helper
This makes it a little easier to look at the main Makefile without getting
overwhelmed by code-generation stuff.
2016-07-12 21:52:54 -07:00