https://github.com/arsenm updated https://github.com/llvm/llvm-project/pull/208421
>From 5e5f15358360ab112aae4e787feab88461dfa781 Mon Sep 17 00:00:00 2001 From: Matt Arsenault <[email protected]> Date: Thu, 9 Jul 2026 12:42:50 +0200 Subject: [PATCH] cmake: Gate host library targets on shared library support This avoids cmake warnings about importing unsupported shared libraries (which are also host build artifacts) when building libc for amdgpu. 00b2f81 guarded exported library targets and host find_package() calls behind "if(NOT CMAKE_CROSSCOMPILING)". The intent was to avoid importing the always-shared targets (LTO, Remarks) on targets which will warn due to not supportind shared libraries. However CMAKE_CROSSCOMPILING is too broad since it is also set for usable cross-built libraries. Change to check if the consuming platform supports shared libraries instead. This feels not quite precise though, since the found libraries could still be static. Co-authored-by: Claude (Opus 4.8) <[email protected]> --- clang/cmake/modules/ClangConfig.cmake.in | 6 +- llvm/cmake/modules/LLVMConfig.cmake.in | 81 ++++++++++++++---------- 2 files changed, 52 insertions(+), 35 deletions(-) diff --git a/clang/cmake/modules/ClangConfig.cmake.in b/clang/cmake/modules/ClangConfig.cmake.in index e199c7e17b6b7..37ff667586834 100644 --- a/clang/cmake/modules/ClangConfig.cmake.in +++ b/clang/cmake/modules/ClangConfig.cmake.in @@ -12,9 +12,9 @@ set(CLANG_INCLUDE_DIRS "@CLANG_CONFIG_INCLUDE_DIRS@") set(CLANG_LINK_CLANG_DYLIB "@CLANG_LINK_CLANG_DYLIB@") set(CLANG_DEFAULT_LINKER "@CLANG_DEFAULT_LINKER@") -# Provide all our library targets to users. -# Skip when cross-compiling, as host library targets are not usable. -if(NOT CMAKE_CROSSCOMPILING) +# Provide all our library targets to users. Skip on platforms that +# can't use them (i.e., targets without shared library support) +if(LLVM_USE_HOST_LIBRARY_TARGETS) @CLANG_CONFIG_INCLUDE_EXPORTS@ endif() diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in index 8eaf659d82c0c..a9d019290db09 100644 --- a/llvm/cmake/modules/LLVMConfig.cmake.in +++ b/llvm/cmake/modules/LLVMConfig.cmake.in @@ -55,48 +55,65 @@ set(LLVM_ENABLE_ASSERTIONS @LLVM_ENABLE_ASSERTIONS@) set(LLVM_ENABLE_EH @LLVM_ENABLE_EH@) +# The exported library targets and used host libraries are only usable +# on platforms that support shared libraries. +get_property(_llvm_target_supports_shared_libs + GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS) +if(NOT DEFINED _llvm_target_supports_shared_libs OR + _llvm_target_supports_shared_libs) + set(LLVM_USE_HOST_LIBRARY_TARGETS ON) +else() + set(LLVM_USE_HOST_LIBRARY_TARGETS OFF) +endif() +unset(_llvm_target_supports_shared_libs) + set(LLVM_ENABLE_FFI @LLVM_ENABLE_FFI@) +if(LLVM_ENABLE_FFI AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(FFI) +endif() + set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@) + +set(LLVM_ENABLE_LIBEDIT @HAVE_LIBEDIT@) +if(LLVM_ENABLE_LIBEDIT AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(LibEdit) +endif() + set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@) + set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@) + set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@) +if(LLVM_ENABLE_ZLIB AND LLVM_USE_HOST_LIBRARY_TARGETS) + set(ZLIB_ROOT @ZLIB_ROOT@) + find_package(ZLIB) +endif() + set(LLVM_ENABLE_ZSTD @LLVM_ENABLE_ZSTD@) +if(LLVM_ENABLE_ZSTD AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(zstd) +endif() + set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@) +if(LLVM_ENABLE_LIBXML2 AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(LibXml2) +endif() + set(LLVM_ENABLE_CURL @LLVM_ENABLE_CURL@) +if(LLVM_ENABLE_CURL AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(CURL) +endif() + set(LLVM_ENABLE_HTTPLIB @LLVM_ENABLE_HTTPLIB@) +if(LLVM_ENABLE_HTTPLIB AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(httplib) +endif() + set(LLVM_WITH_Z3 @LLVM_WITH_Z3@) -set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@) -set(LLVM_ENABLE_LIBEDIT @HAVE_LIBEDIT@) -# These are host libraries that LLVM was built with. Only find them when the -# consumer can actually use them (i.e. not when cross-compiling for an -# incompatible target). -if(NOT CMAKE_CROSSCOMPILING) - if(LLVM_ENABLE_FFI) - find_package(FFI) - endif() - if(LLVM_ENABLE_LIBEDIT) - find_package(LibEdit) - endif() - if(LLVM_ENABLE_ZLIB) - set(ZLIB_ROOT @ZLIB_ROOT@) - find_package(ZLIB) - endif() - if(LLVM_ENABLE_ZSTD) - find_package(zstd) - endif() - if(LLVM_ENABLE_LIBXML2) - find_package(LibXml2) - endif() - if(LLVM_ENABLE_CURL) - find_package(CURL) - endif() - if(LLVM_ENABLE_HTTPLIB) - find_package(httplib) - endif() - if(LLVM_ENABLE_DIA_SDK) - find_package(DIASDK) - endif() +set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@) +if(LLVM_ENABLE_DIA_SDK AND LLVM_USE_HOST_LIBRARY_TARGETS) + find_package(DIASDK) endif() set(LLVM_NATIVE_ARCH @LLVM_NATIVE_ARCH@) @@ -147,7 +164,7 @@ set(LLVM_ENABLE_SHARED_LIBS @BUILD_SHARED_LIBS@) set(LLVM_DEFAULT_EXTERNAL_LIT "@LLVM_CONFIG_DEFAULT_EXTERNAL_LIT@") set(LLVM_LIT_ARGS "@LLVM_LIT_ARGS@") -if(NOT TARGET LLVMSupport) +if(NOT TARGET LLVMSupport AND LLVM_USE_HOST_LIBRARY_TARGETS) @LLVM_CONFIG_INCLUDE_EXPORTS@ @llvm_config_include_buildtree_only_exports@ endif() _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
