"token is not a valid binary operator in a preprocessor subexpression" in GHC HEAD build

I'm trying to build GHC HEAD on Mac OS after a fresh git-pull, and I'm getting the following: libraries/binary/src/Data/Binary/Put.hs:38:27: error: token is not a valid binary operator in a preprocessor subexpression #if MIN_VERSION_bytestring(0,10,4) Any insights/suggestions? I don't need the very latest HEAD version; just a version with ticket 11651 fixed (https://ghc.haskell.org/trac/ghc/ticket/11651#comment:3), and even for that item, I don't mind patching the source myself. Thanks! - Conal