Merge "More fix to llvm-3.?/setup.mk"