Skip to content

Commit b2db399

Browse files
authored
Avoid shipping libclrinterpreter in wasm runtime packs (#121405)
## Description The libclrinterpreter is already linked into the coreclr_static library for wasm in: https://github.com/dotnet/runtime/blob/e0837be345978738d0387055e0eb1e2b989dd787/src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt#L201 This PR updates the build to avoid shipping libclrinterpreter in the wasm runtime packs as separate static librariy, which resolves the manifest errors: ``` The following files are missing entries in the templated manifest: libclrinterpreter.dylib. ``` Fixes #121399
1 parent 6e1e6b1 commit b2db399

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

eng/liveBuilds.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@
223223

224224
<LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'CoreCLR'"
225225
Include="
226-
$(CoreCLRSharedFrameworkDir)libclrinterpreter.a;
227226
$(CoreCLRSharedFrameworkDir)libcoreclr_static.a;
228227
$(CoreCLRSharedFrameworkDir)libcoreclrminipal.a;
229228
$(CoreCLRSharedFrameworkDir)libcoreclrpal.a;

src/coreclr/interpreter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ target_link_libraries(clrinterpreter
6767
${INTERPRETER_LINK_LIBRARIES}
6868
)
6969

70-
if (CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS OR CLR_CMAKE_TARGET_MACCATALYST)
70+
if (FEATURE_STATICALLY_LINKED)
7171
install_clr(TARGETS clrinterpreter DESTINATIONS . COMPONENT runtime OPTIONAL)
7272
else()
7373
install_clr(TARGETS clrinterpreter DESTINATIONS . sharedFramework COMPONENT runtime OPTIONAL)

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@
262262
<PlatformManifestFileEntry Include="ILLink.Substitutions.WasmIntrinsics.xml" IsNative="true" />
263263
<PlatformManifestFileEntry Include="ILLink.Substitutions.NoWasmIntrinsics.xml" IsNative="true" />
264264
<!-- CoreCLR WASM-specific files -->
265-
<PlatformManifestFileEntry Include="libclrinterpreter.a" IsNative="true" />
266265
<PlatformManifestFileEntry Include="libcoreclrminipal.a" IsNative="true" />
267266
<PlatformManifestFileEntry Include="libcoreclrpal.a" IsNative="true" />
268267
<PlatformManifestFileEntry Include="libgcinfo_unix_wasm.a" IsNative="true" />

src/native/corehost/browserhost/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ set(SHARED_CLR_DESTINATION
5757
# these dependencies assume that you built `libs.native+clr.runtime` subsets first
5858
LIST(APPEND NATIVE_LIBS
5959
${SHARED_CLR_DESTINATION}/libcoreclr_static.a
60-
${SHARED_CLR_DESTINATION}/libclrinterpreter.a
6160
${SHARED_CLR_DESTINATION}/libnativeresourcestring.a
6261
${SHARED_CLR_DESTINATION}/libgcinfo_unix_wasm.a
6362
${SHARED_CLR_DESTINATION}/libcoreclrminipal.a

0 commit comments

Comments
 (0)