Fix C++ files detection for automatic C++ ABI enabling.
Merge pull request #2025 from take-cheeze/cxx_abi_fix

Fix C++ files detection for automatic C++ ABI enabling.
Merge branch 'master' into iij