Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Move src/native libraries that are shared between runtime builds to be targets-driven #103184

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 31 commits into from
Jun 24, 2024
Merged

Move src/native libraries that are shared between runtime builds to be targets-driven #103184

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8a3bb1c
Move containers library to be an object library instead of a list of …
jkoritzinsky Jun 6, 2024
0877350
Define default implementation of the simdhash assert failure function…
jkoritzinsky Jun 7, 2024
3adeb0f
Convert EventPipe and DiagnosticServer to be defined as interface lib…
jkoritzinsky Jun 7, 2024
39118f0
Move NativeAOT over to the new model as well.
jkoritzinsky Jun 7, 2024
b7e9e82
Move Mono to the new eventpipe model
jkoritzinsky Jun 7, 2024
82562ff
Remove old eventpipe model
jkoritzinsky Jun 8, 2024
7332da4
Use CMake's Unity Build support instead of our own hacked-together ve…
jkoritzinsky Jun 8, 2024
2f8f361
Flow dn_containers dependency
jkoritzinsky Jun 8, 2024
bf6bb47
Add a comment to explain the rationale for using an INTERFACE lib (as…
jkoritzinsky Jun 8, 2024
062aa32
PCH and UNITY_BUILD don't work together well
jkoritzinsky Jun 10, 2024
e32ce79
Don't build NativeAOT's EP runtime as a unity build, only the shared …
jkoritzinsky Jun 10, 2024
f428cee
Add another dependency for dn-containers to try to fix the android bu…
jkoritzinsky Jun 10, 2024
ed2a27e
Make the EXTERN_C_* macros into function-style macros
jkoritzinsky Jun 10, 2024
e6334b7
Namespace-scope our extern-c block define
jkoritzinsky Jun 11, 2024
847100d
Reference diagnosticserver pal in NativeAOT.
jkoritzinsky Jun 11, 2024
4969670
Fix Windows build in debug-pal and fix NativeAOT linkage issues.
jkoritzinsky Jun 14, 2024
292fac5
Correctly nest initializer for GCC
jkoritzinsky Jun 14, 2024
4d681a5
Just directly extern "C" the headers
jkoritzinsky Jun 14, 2024
81a686e
if not ifdef
jkoritzinsky Jun 14, 2024
5c13647
Try more directly including the container objects
jkoritzinsky Jun 14, 2024
44b7283
Fix other initialization syntax for GCC
jkoritzinsky Jun 14, 2024
f7f398b
Don't reference the diagnostic server PAL on cross-os builds
jkoritzinsky Jun 14, 2024
e08a371
Fix mono-aot-cross build
jkoritzinsky Jun 17, 2024
258221a
Fix win-x86 build.
jkoritzinsky Jun 19, 2024
60cc392
Try using TARGET_OBJECTS to fix the static component libraries
jkoritzinsky Jun 19, 2024
95f8383
Link dn-containers into Mono.framework
jkoritzinsky Jun 19, 2024
a0fb40b
Provide a no-lto flavor of the container library for NativeAOT. This …
jkoritzinsky Jun 19, 2024
78739e3
Make the default impl also cdecl
jkoritzinsky Jun 19, 2024
6d2b05f
Explicitly add eventpipe runtime objects to the static component library
jkoritzinsky Jun 19, 2024
d4ed370
Install compile PDBs for each of the EP libs used in NativeAOT
jkoritzinsky Jun 20, 2024
fc10257
Fix MSBuild build
jkoritzinsky Jun 24, 2024
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
Prev Previous commit
Fix MSBuild build
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Jun 24, 2024
commit fc10257c07a55d83eae72560ec4a9b1910dcaab3
12 changes: 6 additions & 6 deletions src/coreclr/nativeaot/Runtime/eventpipe/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ set_target_properties(eventpipe-shared-objects PROPERTIES
UNITY_BUILD ON
UNITY_BUILD_BATCH_SIZE 0
COMPILE_PDB_NAME "eventpipe-shared-objects"
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>"
)
if (CLR_CMAKE_TARGET_WIN32)
add_library(eventpipe-shared-objects.GuardCF OBJECT)
Expand All @@ -200,16 +200,16 @@ if (CLR_CMAKE_TARGET_WIN32)
UNITY_BUILD_BATCH_SIZE 0
CLR_CONTROL_FLOW_GUARD ON
COMPILE_PDB_NAME "eventpipe-shared-objects.GuardCF"
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")

# Install the compile PDB for the eventpipe unity builds.
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/eventpipe-shared-objects.pdb" DESTINATION aotsdk COMPONENT nativeaot)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/eventpipe-shared-objects.GuardCF.pdb" DESTINATION aotsdk COMPONENT nativeaot)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/eventpipe-shared-objects.pdb" DESTINATION aotsdk COMPONENT nativeaot)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/eventpipe-shared-objects.GuardCF.pdb" DESTINATION aotsdk COMPONENT nativeaot)
# For the container library, we need to produce a compile PDB and install it
set_target_properties(dn-containers-no-lto PROPERTIES
COMPILE_PDB_NAME "dn-containers"
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dn-containers.pdb" DESTINATION aotsdk COMPONENT nativeaot)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/dn-containers.pdb" DESTINATION aotsdk COMPONENT nativeaot)
endif()

list(APPEND EVENTPIPE_SOURCES
Expand Down