Skip to content

[release/5.0] Re-enable support for using the system libunwind #42853

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
Oct 2, 2020
Merged

[release/5.0] Re-enable support for using the system libunwind #42853

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
18 changes: 9 additions & 9 deletions src/installer/corehost/cli/apphost/static/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@ elseif(CLR_CMAKE_TARGET_LINUX)
# )
# endif(CLR_CMAKE_TARGET_OSX)
#
# # On OSX and *BSD, we use the libunwind that's part of the OS
# if(CLR_CMAKE_TARGET_FREEBSD)
# find_unwind_libs(UNWIND_LIBS)
#
# LIST(APPEND CORECLR_LIBRARIES
# ${UNWIND_LIBS}
# )
# endif(CLR_CMAKE_TARGET_FREEBSD)
#
# if(CLR_CMAKE_TARGET_NETBSD)
# find_library(KVM kvm)
#
Expand All @@ -129,6 +120,15 @@ endif(CLR_CMAKE_TARGET_WIN32)
set(NATIVE_LIBS_LOCATION "${NATIVE_LIBS_ARTIFACTS}")
message ("Looking for native libs at location: '${NATIVE_LIBS_LOCATION}'.")

# If/when OSX and *BSD are supported, they should also use the libunwind that's part of the OS
if(CLR_CMAKE_USE_SYSTEM_LIBUNWIND)
find_unwind_libs(UNWIND_LIBS)

LIST(APPEND CORECLR_LIBRARIES
${UNWIND_LIBS}
)
endif()

if(NOT CLR_CMAKE_TARGET_LINUX)
set(NATIVE_LIBS
# Native libs linked into singlefilehost is supported only on Linux for now.
Expand Down
6 changes: 6 additions & 0 deletions src/libraries/Native/Unix/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ else ()
message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()

if(CLR_CMAKE_USE_SYSTEM_LIBUNWIND)
# This variable can be set and used by the coreclr and installer builds.
# Libraries doesn't need it, but not using it makes the build fail. So
# just check and igore the variable.
endif()

# We compile with -Werror, so we need to make sure these code fragments compile without warnings.
# Older CMake versions (3.8) do not assign the result of their tests, causing unused-value errors
# which are not distinguished from the test failing. So no error for that one.
Expand Down