Merged clang toolchain simplification