Reinstate the Mac OS build step.

Now I've got a working Mac, I can build it again.

[originally from svn r10167]