OBJCXX: Fix regression for compiling cpp files as objcxx

Fixes: #21234 (closed)
Backport: release

Edited by Brad King

Merge request reports

Loading