Skip to content

Avoiding trying to load the native library Microsoft.DiaSymReader.Native.<arch>.dll on Linux #92492

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 7 commits into from
Sep 27, 2023
Merged

Avoiding trying to load the native library Microsoft.DiaSymReader.Native.<arch>.dll on Linux #92492

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a7178a
92278_prevent_load_win_dll_on_linux: do not need to probe for Microso…
Sep 22, 2023
5f4cbd8
added comment
Sep 22, 2023
b9fef19
92278: revert ceeload.cpp changes
Sep 22, 2023
2e0f4f4
92278: add DFEATURE_ISYM_READER definition only for windows
Sep 22, 2023
15dfda4
Merge branch 'main' into 92278_prevent_load_win_dll_on_linux
neyromant Sep 23, 2023
ad7b564
Update src/coreclr/clrdefinitions.cmake
jkotas Sep 23, 2023
2379687
Update clrdefinitions.cmake
neyromant Sep 23, 2023
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: 3 additions & 1 deletion src/coreclr/clrdefinitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ endif (CLR_CMAKE_TARGET_WIN32 AND (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARG
if(FEATURE_INTERPRETER)
add_compile_definitions(FEATURE_INTERPRETER)
endif(FEATURE_INTERPRETER)
add_definitions(-DFEATURE_ISYM_READER)
if (CLR_CMAKE_TARGET_WIN32)
add_definitions(-DFEATURE_ISYM_READER)
endif(CLR_CMAKE_TARGET_WIN32)

if(FEATURE_MERGE_JIT_AND_ENGINE)
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_FEATURE_MERGE_JIT_AND_ENGINE>>>:FEATURE_MERGE_JIT_AND_ENGINE>)
Expand Down