Skip to content

Commit 9068296

Browse files
authored
Fix coreclrpal link order in mscordac (#118780)
_Ux86_64_step is used in libcoreclrpal_dac, but defined in libcoreclrpal Fixes: #118695
1 parent f514fa5 commit 9068296

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/coreclr/dlls/mscordac/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ set(COREDAC_LIBRARIES
157157
${END_LIBRARY_GROUP} # End group of libraries that have circular references
158158
)
159159

160+
if(CLR_CMAKE_HOST_UNIX)
161+
list(APPEND COREDAC_LIBRARIES
162+
coreclrpal_dac
163+
)
164+
endif(CLR_CMAKE_HOST_UNIX)
165+
160166
if(CLR_CMAKE_HOST_WIN32)
161167
# mscordac.def should be generated before mscordaccore.dll is built
162168
add_dependencies(mscordaccore mscordaccore_def)
@@ -205,12 +211,6 @@ if(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX)
205211
)
206212
endif(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX)
207213

208-
if(CLR_CMAKE_HOST_UNIX)
209-
list(APPEND COREDAC_LIBRARIES
210-
coreclrpal_dac
211-
)
212-
endif(CLR_CMAKE_HOST_UNIX)
213-
214214
target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES})
215215

216216
esrp_sign(mscordaccore)

0 commit comments

Comments
 (0)