Index: llvm/trunk/runtimes/CMakeLists.txt =================================================================== --- llvm/trunk/runtimes/CMakeLists.txt +++ llvm/trunk/runtimes/CMakeLists.txt @@ -252,6 +252,7 @@ -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON PASSTHROUGH_PREFIXES COMPILER_RT + CLANG_DEFAULT USE_TOOLCHAIN ${EXTRA_ARGS}) endfunction() @@ -283,6 +284,7 @@ -DCMAKE_ASM_COMPILER_WORKS=ON -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON ${${target}_extra_args} + PASSTHROUGH_PREFIXES CLANG_DEFAULT TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib USE_TOOLCHAIN ${EXTRA_ARGS}) @@ -376,6 +378,7 @@ -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES + CLANG_DEFAULT ${ARG_PREFIXES} EXTRA_TARGETS ${extra_targets} ${test_targets} @@ -459,6 +462,7 @@ -DLLVM_RUNTIMES_TARGET=${name} ${${name}_extra_args} PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES + CLANG_DEFAULT TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib EXTRA_TARGETS ${${name}_extra_targets} ${${name}_test_targets}