bz19970: OSX build updates.

Thanks Geoff Lee