This is an archive of the discontinued LLVM Phabricator instance.

Differential D47168

[CMake] Pass Clang defaults to runtimes builds
ClosedPublic

Authored by phosek on May 21 2018, 4:24 PM.

Details

Reviewers
beanz
vitalybuka
Commits
rG0681d9e6d961: [CMake] Pass Clang defaults to runtimes builds
rL332923: [CMake] Pass Clang defaults to runtimes builds
Summary

This enables the use of Clang default options from runtimes CMake files.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.May 21 2018, 4:24 PM
Herald added subscribers: llvm-commits, mgorny. · View Herald TranscriptMay 21 2018, 4:24 PM
phosek added a comment.May 21 2018, 4:25 PM

See D47100 and D47115 for example use case.

phosek added a child revision: D47100: [CMake] Support libc++ as Clang default stdlib in compiler-rt.May 21 2018, 4:41 PM
vitalybuka accepted this revision.May 21 2018, 5:24 PM
This revision is now accepted and ready to land.May 21 2018, 5:24 PM
Closed by commit rL332923: [CMake] Pass Clang defaults to runtimes builds (authored by phosek). · Explain WhyMay 21 2018, 5:46 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
runtimes/
4 lines

Diff 147925

llvm/trunk/runtimes/CMakeLists.txt

Show First 20 Lines • Show All 246 Lines • ▼ Show 20 Lines llvm_ExternalProject_Add(builtins
${compiler_rt_path}/lib/builtins ${compiler_rt_path}/lib/builtins
CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR} CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR} -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
-DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE}
-DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE}
-DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_C_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON
PASSTHROUGH_PREFIXES COMPILER_RT PASSTHROUGH_PREFIXES COMPILER_RT
CLANG_DEFAULT
USE_TOOLCHAIN USE_TOOLCHAIN
${EXTRA_ARGS}) ${EXTRA_ARGS})
endfunction() endfunction()
function(builtin_register_target compiler_rt_path target) function(builtin_register_target compiler_rt_path target)
string(REPLACE "-" ";" builtin_target_list ${target}) string(REPLACE "-" ";" builtin_target_list ${target})
foreach(item ${builtin_target_list}) foreach(item ${builtin_target_list})
string(TOLOWER "${item}" item_lower) string(TOLOWER "${item}" item_lower)
Show All 15 Lines llvm_ExternalProject_Add(builtins-${target}
CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR} CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR} -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
-DCMAKE_C_COMPILER_TARGET=${target} -DCMAKE_C_COMPILER_TARGET=${target}
-DCMAKE_ASM_COMPILER_TARGET=${target} -DCMAKE_ASM_COMPILER_TARGET=${target}
-DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_C_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
${${target}_extra_args} ${${target}_extra_args}
PASSTHROUGH_PREFIXES CLANG_DEFAULT
TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib
USE_TOOLCHAIN USE_TOOLCHAIN
${EXTRA_ARGS}) ${EXTRA_ARGS})
endfunction() endfunction()
# If compiler-rt is present we need to build the builtin libraries first. This # If compiler-rt is present we need to build the builtin libraries first. This
# is required because the other runtimes need the builtin libraries present # is required because the other runtimes need the builtin libraries present
# before the just-built compiler can pass the configuration tests. # before the just-built compiler can pass the configuration tests.
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Lines llvm_ExternalProject_Add(runtimes
-DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR} -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
-DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE}
-DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE} -DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE}
-DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE}
-DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_C_COMPILER_WORKS=ON
-DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
CLANG_DEFAULT
${ARG_PREFIXES} ${ARG_PREFIXES}
EXTRA_TARGETS ${extra_targets} EXTRA_TARGETS ${extra_targets}
${test_targets} ${test_targets}
${SUB_COMPONENTS} ${SUB_COMPONENTS}
${SUB_CHECK_TARGETS} ${SUB_CHECK_TARGETS}
${SUB_INSTALL_TARGETS} ${SUB_INSTALL_TARGETS}
USE_TOOLCHAIN USE_TOOLCHAIN
${EXTRA_ARGS}) ${EXTRA_ARGS})
▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Lines llvm_ExternalProject_Add(runtimes-${name}
-DCMAKE_ASM_COMPILER_TARGET=${target} -DCMAKE_ASM_COMPILER_TARGET=${target}
-DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_C_COMPILER_WORKS=ON
-DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON
-DCMAKE_ASM_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-DLLVM_RUNTIMES_TARGET=${name} -DLLVM_RUNTIMES_TARGET=${name}
${${name}_extra_args} ${${name}_extra_args}
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
CLANG_DEFAULT
TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib
EXTRA_TARGETS ${${name}_extra_targets} EXTRA_TARGETS ${${name}_extra_targets}
${${name}_test_targets} ${${name}_test_targets}
USE_TOOLCHAIN USE_TOOLCHAIN
${EXTRA_ARGS}) ${EXTRA_ARGS})
endfunction() endfunction()
if(runtimes) if(runtimes)
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines