More fixup of the build on Mac for HHVM