https://github.com/nextsilicon-itay-bookstein created https://github.com/llvm/llvm-project/pull/186680
This reverts commit 42b638c6b40d2670560bc5d855154d8677760360. We revert due to an ODR violation regression described in https://github.com/llvm/llvm-project/pull/184201#issuecomment-4062785640 The clang-tblgen binary ends up linking against clangSupport both through the objlib and through libLLVM-*.so due to link interface propagation. A reland needs to find a way for the change in llvm_add_library to not propagate the link interface, just the include interface, like the $<COMPILE_ONLY:...> generator expression from CMake 3.27 achieves: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#genex:COMPILE_ONLY >From f3c46e5bfa1b4ab9f890e8ff7120d00bc8d190ab Mon Sep 17 00:00:00 2001 From: Itay Bookstein <[email protected]> Date: Sun, 15 Mar 2026 18:36:02 +0200 Subject: [PATCH] Revert "[CMake] Propagate dependencies to OBJECT libraries in add_llvm_library (re-land)" This reverts commit 42b638c6b40d2670560bc5d855154d8677760360. We revert due to an ODR violation regression described in https://github.com/llvm/llvm-project/pull/184201#issuecomment-4062785640 The clang-tblgen binary ends up linking against clangSupport both through the objlib and through libLLVM-*.so due to link interface propagation. A reland needs to find a way for the change in llvm_add_library to not propagate the link interface, just the include interface, like the $<COMPILE_ONLY:...> generator expression from CMake 3.27 achieves: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#genex:COMPILE_ONLY --- clang/cmake/modules/AddClang.cmake | 2 +- lld/tools/lld/CMakeLists.txt | 2 +- llvm/cmake/modules/AddLLVM.cmake | 29 ++++++++++++---------------- llvm/cmake/modules/LLVM-Config.cmake | 5 +---- mlir/cmake/modules/AddMLIR.cmake | 2 +- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index e2112d7c326e2..c811b7f459126 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake @@ -217,7 +217,7 @@ endmacro() function(clang_target_link_libraries target type) if (TARGET obj.${target}) - target_link_libraries(obj.${target} ${type} ${ARGN}) + target_link_libraries(obj.${target} ${ARGN}) endif() get_property(LLVM_DRIVER_TOOLS GLOBAL PROPERTY LLVM_DRIVER_TOOLS) diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt index 1d1a7ff448b7c..8498a91597a93 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -13,7 +13,7 @@ export_executable_symbols_for_plugins(lld) function(lld_target_link_libraries target type) if (TARGET obj.${target}) - target_link_libraries(obj.${target} ${type} ${ARGN}) + target_link_libraries(obj.${target} ${ARGN}) endif() get_property(LLVM_DRIVER_TOOLS GLOBAL PROPERTY LLVM_DRIVER_TOOLS) diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 4538d80179764..51ecbf079be78 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -6,14 +6,14 @@ include(DetermineGCCCompatible) # get_subproject_title(titlevar) # Set ${outvar} to the title of the current LLVM subproject (Clang, MLIR ...) -# +# # The title is set in the subproject's top-level using the variable # LLVM_SUBPROJECT_TITLE. If it does not exist, it is assumed it is LLVM itself. # The title is not semantically significant, but use to create folders in # CMake-generated IDE projects (Visual Studio/XCode). function(get_subproject_title outvar) if (LLVM_SUBPROJECT_TITLE) - set(${outvar} "${LLVM_SUBPROJECT_TITLE}" PARENT_SCOPE) + set(${outvar} "${LLVM_SUBPROJECT_TITLE}" PARENT_SCOPE) else () set(${outvar} "LLVM" PARENT_SCOPE) endif () @@ -641,12 +641,7 @@ function(llvm_add_library name) # Do add_dependencies(obj) later due to CMake issue 14747. list(APPEND objlibs ${obj_name}) - # Bring in the target include directories and link info from our original - # target. target_link_libraries propagates transitive dependencies with - # proper SYSTEM include handling from IMPORTED targets. - # target_include_directories propagates include directories set directly on - # the target. - target_link_libraries(${obj_name} PRIVATE $<TARGET_PROPERTY:${name},LINK_LIBRARIES>) + # Bring in the target include directories from our original target. target_include_directories(${obj_name} PRIVATE $<TARGET_PROPERTY:${name},INCLUDE_DIRECTORIES>) set_target_properties(${obj_name} PROPERTIES FOLDER "${subproject_title}/Object Libraries") @@ -712,11 +707,11 @@ function(llvm_add_library name) endif() set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Libraries") - ## If were compiling with clang-cl use /Zc:dllexportInlines- to exclude inline + ## If were compiling with clang-cl use /Zc:dllexportInlines- to exclude inline ## class members from being dllexport'ed to reduce compile time. ## This will also keep us below the 64k exported symbol limit ## https://blog.llvm.org/2018/11/30-faster-windows-builds-with-clang-cl_14.html - if(LLVM_BUILD_LLVM_DYLIB AND NOT LLVM_DYLIB_EXPORT_INLINES AND + if(LLVM_BUILD_LLVM_DYLIB AND NOT LLVM_DYLIB_EXPORT_INLINES AND MSVC AND CMAKE_CXX_COMPILER_ID MATCHES Clang) target_compile_options(${name} PUBLIC /Zc:dllexportInlines-) if(TARGET ${obj_name}) @@ -1127,7 +1122,7 @@ macro(generate_llvm_objects name) set_property(GLOBAL APPEND PROPERTY LLVM_DRIVER_TOOLS ${name}) set_property(GLOBAL APPEND PROPERTY LLVM_DRIVER_TOOL_ALIASES_${name} ${name}) - target_link_libraries(${obj_name} PUBLIC ${LLVM_PTHREAD_LIB}) + target_link_libraries(${obj_name} ${LLVM_PTHREAD_LIB}) llvm_config(${obj_name} ${USE_SHARED} ${LLVM_LINK_COMPONENTS} ) endif() endif() @@ -1609,8 +1604,8 @@ macro(llvm_add_tool project name) RUNTIME DESTINATION ${${project}_TOOLS_INSTALL_DIR} COMPONENT ${name}) if (LLVM_ENABLE_PDB) - install(FILES $<TARGET_PDB_FILE:${name}> - DESTINATION "${${project}_TOOLS_INSTALL_DIR}" COMPONENT ${name} + install(FILES $<TARGET_PDB_FILE:${name}> + DESTINATION "${${project}_TOOLS_INSTALL_DIR}" COMPONENT ${name} OPTIONAL) endif() @@ -1644,8 +1639,8 @@ macro(add_llvm_example name) if( LLVM_BUILD_EXAMPLES ) install(TARGETS ${name} RUNTIME DESTINATION "${LLVM_EXAMPLES_INSTALL_DIR}") if (LLVM_ENABLE_PDB) - install(FILES $<TARGET_PDB_FILE:${name}> - DESTINATION "${LLVM_EXAMPLES_INSTALL_DIR}" COMPONENT ${name} + install(FILES $<TARGET_PDB_FILE:${name}> + DESTINATION "${LLVM_EXAMPLES_INSTALL_DIR}" COMPONENT ${name} OPTIONAL) endif() endif() @@ -1683,8 +1678,8 @@ macro(add_llvm_utility name) RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR} COMPONENT ${name}) if (LLVM_ENABLE_PDB) - install(FILES $<TARGET_PDB_FILE:${name}> - DESTINATION "${LLVM_UTILS_INSTALL_DIR}" COMPONENT ${name} + install(FILES $<TARGET_PDB_FILE:${name}> + DESTINATION "${LLVM_UTILS_INSTALL_DIR}" COMPONENT ${name} OPTIONAL) endif() diff --git a/llvm/cmake/modules/LLVM-Config.cmake b/llvm/cmake/modules/LLVM-Config.cmake index 7da7e40f3b0fe..96ccf20aa89bd 100644 --- a/llvm/cmake/modules/LLVM-Config.cmake +++ b/llvm/cmake/modules/LLVM-Config.cmake @@ -106,10 +106,7 @@ function(explicit_llvm_config executable) get_target_property(t ${executable} TYPE) if(t STREQUAL "STATIC_LIBRARY") target_link_libraries(${executable} INTERFACE ${LIBRARIES}) - elseif(t STREQUAL "EXECUTABLE" OR - t STREQUAL "SHARED_LIBRARY" OR - t STREQUAL "MODULE_LIBRARY" OR - t STREQUAL "OBJECT_LIBRARY") + elseif(t STREQUAL "EXECUTABLE" OR t STREQUAL "SHARED_LIBRARY" OR t STREQUAL "MODULE_LIBRARY") target_link_libraries(${executable} PRIVATE ${LIBRARIES}) else() # Use plain form for legacy user. diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake index 60b73876d53fe..b240aeba23109 100644 --- a/mlir/cmake/modules/AddMLIR.cmake +++ b/mlir/cmake/modules/AddMLIR.cmake @@ -769,7 +769,7 @@ endfunction(mlir_check_all_link_libraries) # used. function(mlir_target_link_libraries target type) if (TARGET obj.${target}) - target_link_libraries(obj.${target} ${type} ${ARGN}) + target_link_libraries(obj.${target} ${ARGN}) endif() if (MLIR_LINK_MLIR_DYLIB) _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
