Update patch set 1

Patch Set 1:

> Patch Set 1:
> 
> Is there anything I can do to get this landed? It'd be really useful to have this fixed in Node, as it massively confuses everyone building a native module (see nodejs/node-gyp#569 for example).
> 
> I am happy to PR a minimal diff (see nodejs/node-gyp#1370) if that'd be helpful.

I think we need the issues Mark identified to be addressed?

Patch-set: 1
Reviewer: Gerrit User 1003232 <1003232@3ce6091f-6c88-37e8-8c75-72f92ae8dfba>