Skip to content

Commit 31c3ed9

Browse files
authored
Always enable static linking when dynamic code compiled feature is false (#124403)
If dynamic code compiled feature is false then we produce the interpreter library, which currently doesn't have a PlatformManifestEntry. Rather than including this in the manifest entries, simply link the interpreter library into the runtime.
1 parent 1a4ad93 commit 31c3ed9

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/coreclr/clrfeatures.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ if (FEATURE_DYNAMIC_CODE_COMPILED)
33
set(FEATURE_REJIT 1)
44
endif()
55

6-
if (CLR_CMAKE_TARGET_ARCH_WASM OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS OR CLR_CMAKE_TARGET_MACCATALYST)
6+
# On desktop, if dynamic code compiled is false, we still enable static linking so we don't have to add platform manifest entries
7+
# for interpreter library, which is required for the packs build
8+
if (CLR_CMAKE_TARGET_ARCH_WASM OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS OR CLR_CMAKE_TARGET_MACCATALYST OR NOT FEATURE_DYNAMIC_CODE_COMPILED)
79
set(FEATURE_STATICALLY_LINKED 1)
810
endif()
911

0 commit comments

Comments
 (0)