Skip to content

Commit

Permalink
[CMake] Fix building on Haiku and Solaris after c0d5d36 (#78084)
Browse files Browse the repository at this point in the history
Haiku and Solaris need some additional libraries after the commit
c0d5d36

Otherwise fails to link a whole bunch of the tools and other binaries
with undefined symbols with accept() and connect().

I did a static and dynamic build on illumos and a dynamic build on
Haiku.

```
-DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra;lld;mlir'
```
and on illumos
```
-DLLVM_ENABLE_RUNTIMES='openmp'
```
  • Loading branch information
brad0 committed Jan 15, 2024
1 parent 332be17 commit 2e0a105
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
4 changes: 2 additions & 2 deletions llvm/lib/Support/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ elseif( CMAKE_HOST_UNIX )
set(system_libs ${system_libs} m)
endif()
if( UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
set(system_libs ${system_libs} kstat)
set(system_libs ${system_libs} kstat socket)
endif()
if( FUCHSIA )
set(system_libs ${system_libs} zircon)
endif()
if ( HAIKU )
add_compile_definitions(_BSD_SOURCE)
set(system_libs ${system_libs} bsd)
set(system_libs ${system_libs} bsd network)
endif()
endif( MSVC OR MINGW )

Expand Down
10 changes: 3 additions & 7 deletions llvm/tools/llvm-jitlink/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@ add_llvm_tool(llvm-jitlink
llvm-jitlink-statistics.cpp
)

if(${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
target_link_libraries(llvm-jitlink PRIVATE network)
endif()

if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries(llvm-jitlink PRIVATE socket nsl)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries(llvm-jitlink PRIVATE socket)
endif()

export_executable_symbols(llvm-jitlink)
8 changes: 0 additions & 8 deletions llvm/tools/llvm-jitlink/llvm-jitlink-executor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,4 @@ add_llvm_utility(llvm-jitlink-executor
intrinsics_gen
)

if(${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
target_link_libraries(llvm-jitlink-executor PRIVATE network)
endif()

if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries(llvm-jitlink-executor PRIVATE socket)
endif()

export_executable_symbols(llvm-jitlink-executor)

0 comments on commit 2e0a105

Please sign in to comment.