Merge pull request #10442 from thomasvl/objc_build_tweak

Minor tweaks to the ObjC build helper.