Looks good. I had no idea that option existed, but I build your branch and it worked and did not report looking for a C++ compiler.

The pull request has not shown up here yet so I won't review on github unless you need me to do that. (I brought over the code and looked at it on my computer.)

Thanks for looking at that. I didn't Jenkins it, but I did build it myself and it works for me too. I'll merge it in the morning.

By which I mean now, as it's shown up here, so I'll just hit the button...

Merged.