Merge "Fix bison build with MacOSX SDK 10.6"