This is an archive of the discontinued LLVM Phabricator instance.

Differential D117746

[CMake] Pass CMAKE_C/CXX_COMPILER_LAUNCHER down to cross-compile and runtime build
ClosedPublic

Authored by ychen on Jan 19 2022, 9:23 PM.

Details

Reviewers
dexonsmith
Commits
rGda85307ba699: [CMake] Pass CMAKE_C/CXX_COMPILER_LAUNCHER down to cross-compile and runtime…
Summary

Similar to D59032.

Diff Detail

Event Timeline

ychen created this revision.Jan 19 2022, 9:23 PM
Herald added a subscriber: mgorny. · View Herald TranscriptJan 19 2022, 9:23 PM
ychen requested review of this revision.Jan 19 2022, 9:23 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 19 2022, 9:23 PM
Herald added subscribers: llvm-commits, cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B144477: Diff 401499.Jan 19 2022, 10:06 PM
ychen added a comment.Jan 21 2022, 3:09 PM

Hi @dexonsmith, sorry for the quick ping. Does this look good to you? Thanks.

dexonsmith accepted this revision.Jan 21 2022, 3:14 PM

Sure, seems reasonable to me. LGTM.

This revision is now accepted and ready to land.Jan 21 2022, 3:14 PM
ychen updated this revision to Diff 402162.Jan 21 2022, 7:45 PM
  • Add one more place this is needed.
Harbormaster completed remote builds in B144972: Diff 402162.Jan 21 2022, 8:17 PM
Closed by commit rGda85307ba699: [CMake] Pass CMAKE_C/CXX_COMPILER_LAUNCHER down to cross-compile and runtime… (authored by Yuanfang Chen <yuanfang.chen@sony.com>). · Explain WhyJan 24 2022, 2:27 PM
This revision was automatically updated to reflect the committed changes.
ychen added a commit: rGda85307ba699: [CMake] Pass CMAKE_C/CXX_COMPILER_LAUNCHER down to cross-compile and runtime….

Revision Contents

PathSize
clang/
runtime/
2 lines
llvm/
cmake/
modules/
2 lines
2 lines

Diff 402667

clang/runtime/CMakeLists.txt

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines ExternalProject_Add(compiler-rt
STAMP_DIR ${STAMP_DIR} STAMP_DIR ${STAMP_DIR}
BINARY_DIR ${BINARY_DIR} BINARY_DIR ${BINARY_DIR}
CMAKE_ARGS ${CLANG_COMPILER_RT_CMAKE_ARGS} CMAKE_ARGS ${CLANG_COMPILER_RT_CMAKE_ARGS}
-DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang
-DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++ -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++
-DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
-DLLVM_CONFIG_PATH=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-config -DLLVM_CONFIG_PATH=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-config
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
-DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
-DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
-DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
-DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
▲ Show 20 Lines • Show All 80 Lines • Show Last 20 Lines

llvm/cmake/modules/CrossCompile.cmake

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines foreach(project ${LLVM_EXTERNAL_PROJECTS})
canonicalize_tool_name(${project} name) canonicalize_tool_name(${project} name)
list(APPEND external_project_source_dirs list(APPEND external_project_source_dirs
"-DLLVM_EXTERNAL_${name}_SOURCE_DIR=${LLVM_EXTERNAL_${name}_SOURCE_DIR}") "-DLLVM_EXTERNAL_${name}_SOURCE_DIR=${LLVM_EXTERNAL_${name}_SOURCE_DIR}")
endforeach() endforeach()
add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt
COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
-DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}"
-DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}"
${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR} ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR}
${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}} ${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}}
-DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
-DLLVM_TARGETS_TO_BUILD="${targets_to_build_arg}" -DLLVM_TARGETS_TO_BUILD="${targets_to_build_arg}"
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${experimental_targets_to_build_arg}" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${experimental_targets_to_build_arg}"
-DLLVM_DEFAULT_TARGET_TRIPLE="${TARGET_TRIPLE}" -DLLVM_DEFAULT_TARGET_TRIPLE="${TARGET_TRIPLE}"
-DLLVM_TARGET_ARCH="${LLVM_TARGET_ARCH}" -DLLVM_TARGET_ARCH="${LLVM_TARGET_ARCH}"
-DLLVM_ENABLE_PROJECTS="${llvm_enable_projects_arg}" -DLLVM_ENABLE_PROJECTS="${llvm_enable_projects_arg}"
Show All 40 Lines

llvm/cmake/modules/LLVMExternalProjectUtils.cmake

Show First 20 Lines • Show All 308 Lines • ▼ Show 20 Lines CMAKE_ARGS ${${nameCanon}_CMAKE_ARGS}
-DLLVM_HAVE_LINK_VERSION_SCRIPT=${LLVM_HAVE_LINK_VERSION_SCRIPT} -DLLVM_HAVE_LINK_VERSION_SCRIPT=${LLVM_HAVE_LINK_VERSION_SCRIPT}
-DLLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO=${LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO} -DLLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO=${LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO}
-DLLVM_USE_RELATIVE_PATHS_IN_FILES=${LLVM_USE_RELATIVE_PATHS_IN_FILES} -DLLVM_USE_RELATIVE_PATHS_IN_FILES=${LLVM_USE_RELATIVE_PATHS_IN_FILES}
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
-DLLVM_SOURCE_PREFIX=${LLVM_SOURCE_PREFIX} -DLLVM_SOURCE_PREFIX=${LLVM_SOURCE_PREFIX}
-DPACKAGE_VERSION=${PACKAGE_VERSION} -DPACKAGE_VERSION=${PACKAGE_VERSION}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_EXPORT_COMPILE_COMMANDS=1
${cmake_args} ${cmake_args}
${PASSTHROUGH_VARIABLES} ${PASSTHROUGH_VARIABLES}
INSTALL_COMMAND "" INSTALL_COMMAND ""
STEP_TARGETS configure build STEP_TARGETS configure build
BUILD_ALWAYS 1 BUILD_ALWAYS 1
USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_CONFIGURE 1
USES_TERMINAL_BUILD 1 USES_TERMINAL_BUILD 1
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines