Set CPLUSPLUS to tc-getCXX and more elegant fix for issue #230

Package-Manager: portage-2.2.0_alpha177