diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2020-09-02 11:51:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 11:51:44 +0300 |
| commit | a664bbc7b6b42a88bf3597834f620a41be8fcee5 (patch) | |
| tree | 01564f7fa12c1a8cfe344e6f5bbc034f13a0f57e | |
| parent | cfd60300ced9acd1bfa417d89cfd9f0136ec07e2 (diff) | |
Fix multiple version strings in coreclr shared libraries (#41711)
We were incorrectly adding the version.c source to all coreclr
libraries and not just the shared ones. That caused multiple
occurences of the version string in coreclr shared libraries
composed of sublibraries.
This change fixes it by adding that source file for shared
libraries only.
I've also discovered that libcoreclrtraceptprovider.so was
missing the version string completely, so I've added it there.
| -rw-r--r-- | eng/native/functions.cmake | 4 | ||||
| -rw-r--r-- | src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake index 1509a17fa59..1bdcf1ddd38 100644 --- a/eng/native/functions.cmake +++ b/eng/native/functions.cmake @@ -439,11 +439,11 @@ function(_add_executable) endfunction() function(_add_library) - if(NOT WIN32) + if(NOT WIN32 AND "${ARGV1}" STREQUAL "SHARED") add_library(${ARGV} ${VERSION_FILE_PATH}) else() add_library(${ARGV}) - endif(NOT WIN32) + endif(NOT WIN32 AND "${ARGV1}" STREQUAL "SHARED") list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX) if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1) set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1) diff --git a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt index d55dab3557f..b6b54e24ac7 100644 --- a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt +++ b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt @@ -55,6 +55,7 @@ add_library(eventprovider add_library(coreclrtraceptprovider SHARED ${TRACEPOINT_PROVIDER_SOURCES} + ${VERSION_FILE_PATH} ) add_dependencies(eventprovider generated_eventing_headers) |