Fix Xcode builds on 10.9.

CLT-only builds are still broken and need to be fixed at some point.

Closes #20524.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Merge branch 'master' of http://github.com/mxcl/homebrew