Allow fish shell to build correctly on OS X Mavericks

Fixes #21983