Fix linking bug on OSX

Manually set CXX flag to clang++ to make sure it links the
C++ files correctly. Strange bug and a bit of a hacky fix,
but seems to work on Mavericks