build: Attempt to rectify inconsistencies between CMake and LLVMBuild versions of...