Skip to content

[CMake] Fix building on Haiku and Solaris after c0d5d36dda04cdd409aabc015da0beb810842fcd #78084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2024
Merged

[CMake] Fix building on Haiku and Solaris after c0d5d36dda04cdd409aabc015da0beb810842fcd #78084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/lib/Support/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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)