Fix to allow the user to specify the CXXFLAGS.