Temporarily re-apply https://reviews.llvm.org/D74347

It was reverted in 35367e06
because it broke the buildbot due to missing libc++abi headers.

https://reviews.llvm.org/D75991 improves the diagnostics, so I hope
the build log will be more informative.