Skip to content

Commit d2c3c65

Browse files
radekdoulikjkotas
andauthored
Link interpreter statically only when JIT is missing
Co-authored-by: Jan Kotas <[email protected]>
1 parent b36bde5 commit d2c3c65

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/coreclr/vm/codeman.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3753,7 +3753,9 @@ BOOL InterpreterJitManager::LoadInterpreter()
37533753
ICorJitCompiler* newInterpreter = NULL;
37543754
m_interpreter = NULL;
37553755

3756-
#ifdef FEATURE_STATICALLY_LINKED
3756+
// If both JIT and interpret are available, statically link the JIT. Interpret can be loaded dynamically
3757+
// via config switch for testing purposes.
3758+
#if defined(FEATURE_STATICALLY_LINKED) && !defined(FEATURE_JIT)
37573759
newInterpreter = InitializeStaticJIT();
37583760
#else // !FEATURE_STATICALLY_LINKED
37593761
g_interpreterLoadData.jld_id = JIT_LOAD_INTERPRETER;

0 commit comments

Comments
 (0)