Merge pull request #2397 from hzeller/feature-20250425-always-xc++

Make sure that -xc++ is always part of the compilation DB.