Skip to content

Commit 1ce95fb

Browse files
authored
Cleanup --whole-archive linking (#115194)
1 parent 1949af0 commit 1ce95fb

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

src/coreclr/dlls/mscordac/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ else(CLR_CMAKE_HOST_WIN32)
116116
# ensure proper resolving of circular references between a subset of the libraries.
117117
set(START_LIBRARY_GROUP -Wl,--start-group)
118118
set(END_LIBRARY_GROUP -Wl,--end-group)
119-
120-
# These options are used to force every object to be included even if it's unused.
121-
set(START_WHOLE_ARCHIVE -Wl,--whole-archive)
122-
set(END_WHOLE_ARCHIVE -Wl,--no-whole-archive)
123119
endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS OR CLR_CMAKE_HOST_HAIKU)
124120

125121
set_exports_linker_option(${EXPORTS_FILE})
@@ -150,10 +146,8 @@ set(COREDAC_LIBRARIES
150146
${START_LIBRARY_GROUP} # Start group of libraries that have circular references
151147
cee_dac
152148
cordbee_dac
153-
${START_WHOLE_ARCHIVE} # force all exports to be available
154149
corguids
155150
daccess
156-
${END_WHOLE_ARCHIVE}
157151
dbgutil
158152
mdcompiler_dac
159153
mdruntime_dac
@@ -200,10 +194,8 @@ if(CLR_CMAKE_HOST_WIN32)
200194
else(CLR_CMAKE_HOST_WIN32)
201195
list(APPEND COREDAC_LIBRARIES
202196
mscorrc
203-
${START_WHOLE_ARCHIVE} # force all PAL objects to be included so all exports are available
204197
coreclrpal
205198
coreclrminipal
206-
${END_WHOLE_ARCHIVE}
207199
)
208200
endif(CLR_CMAKE_HOST_WIN32)
209201

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ else(CLR_CMAKE_HOST_WIN32)
5050
set(END_WHOLE_ARCHIVE -Wl,--no-whole-archive)
5151
endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD OR CLR_CMAKE_TARGET_SUNOS OR CLR_CMAKE_HOST_HAIKU)
5252

53-
if(CLR_CMAKE_TARGET_OSX)
54-
# These options are used to force every object to be included even if it's unused.
55-
set(START_WHOLE_ARCHIVE -force_load)
56-
set(END_WHOLE_ARCHIVE )
57-
endif(CLR_CMAKE_TARGET_OSX)
58-
5953
set_exports_linker_option(${EXPORTS_FILE})
6054

6155
endif (CLR_CMAKE_HOST_WIN32)
@@ -131,9 +125,7 @@ if(CLR_CMAKE_TARGET_WIN32)
131125
)
132126
else()
133127
list(APPEND CORECLR_LIBRARIES
134-
${START_WHOLE_ARCHIVE} # force all PAL objects to be included so all exports are available
135128
coreclrpal
136-
${END_WHOLE_ARCHIVE}
137129
mscorrc
138130
)
139131
endif(CLR_CMAKE_TARGET_WIN32)

0 commit comments

Comments
 (0)