[llvm] e3ae2a5 - [llvm][CMake] Check dependency cxx source compiles (#68549)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 18 09:03:08 PDT 2023
Author: Eric Kilmer
Date: 2023-10-18T09:03:04-07:00
New Revision: e3ae2a52d2232e3b41caa9cf1197c24130249ddd
URL: https://github.com/llvm/llvm-project/commit/e3ae2a52d2232e3b41caa9cf1197c24130249ddd
DIFF: https://github.com/llvm/llvm-project/commit/e3ae2a52d2232e3b41caa9cf1197c24130249ddd.diff
LOG: [llvm][CMake] Check dependency cxx source compiles (#68549)
If a CMake project doesn't enable the C language, then the CMake FFI and
Terminfo find modules will fail their checks for compilation and
linking.
This commit allows projects to enable only C++ by first checking if a C
compiler is set before testing C source compilation; if not, it checks
whether C++ compilation succeeds.
Fixes #53950
Added:
Modified:
llvm/cmake/modules/FindFFI.cmake
llvm/cmake/modules/FindTerminfo.cmake
Removed:
################################################################################
diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake
index a493a89d630171f..c9ba104601872eb 100644
--- a/llvm/cmake/modules/FindFFI.cmake
+++ b/llvm/cmake/modules/FindFFI.cmake
@@ -38,15 +38,27 @@ find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR})
if(FFI_LIBRARIES)
include(CMakePushCheckState)
- include(CheckCSourceCompiles)
cmake_push_check_state()
list(APPEND CMAKE_REQUIRED_LIBRARIES ${FFI_LIBRARIES})
- check_c_source_compiles("
+ set(HAVE_FFI_CALL_SRC [=[
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
struct ffi_cif;
typedef struct ffi_cif ffi_cif;
void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue);
- int main(void) { ffi_call(0, 0, 0, 0); }"
- HAVE_FFI_CALL)
+ #ifdef __cplusplus
+ }
+ #endif
+ int main(void) { ffi_call(0, 0, 0, 0); }
+ ]=])
+ if(DEFINED CMAKE_C_COMPILER)
+ include(CheckCSourceCompiles)
+ check_c_source_compiles("${HAVE_FFI_CALL_SRC}" HAVE_FFI_CALL)
+ else()
+ include(CheckCXXSourceCompiles)
+ check_cxx_source_compiles("${HAVE_FFI_CALL_SRC}" HAVE_FFI_CALL)
+ endif()
cmake_pop_check_state()
endif()
diff --git a/llvm/cmake/modules/FindTerminfo.cmake b/llvm/cmake/modules/FindTerminfo.cmake
index eef1f95853eb27c..163af6697067710 100644
--- a/llvm/cmake/modules/FindTerminfo.cmake
+++ b/llvm/cmake/modules/FindTerminfo.cmake
@@ -15,13 +15,25 @@ find_library(Terminfo_LIBRARIES NAMES terminfo tinfo curses ncurses ncursesw)
if(Terminfo_LIBRARIES)
include(CMakePushCheckState)
- include(CheckCSourceCompiles)
cmake_push_check_state()
list(APPEND CMAKE_REQUIRED_LIBRARIES ${Terminfo_LIBRARIES})
- check_c_source_compiles("
+ set(Terminfo_LINKABLE_SRC [=[
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
int setupterm(char *term, int filedes, int *errret);
- int main(void) { return setupterm(0, 0, 0); }"
- Terminfo_LINKABLE)
+ #ifdef __cplusplus
+ }
+ #endif
+ int main(void) { return setupterm(0, 0, 0); }
+ ]=])
+ if(DEFINED CMAKE_C_COMPILER)
+ include(CheckCSourceCompiles)
+ check_c_source_compiles("${Terminfo_LINKABLE_SRC}" Terminfo_LINKABLE)
+ else()
+ include(CheckCXXSourceCompiles)
+ check_cxx_source_compiles("${Terminfo_LINKABLE_SRC}" Terminfo_LINKABLE)
+ endif()
cmake_pop_check_state()
endif()
More information about the llvm-commits
mailing list