diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2015-04-07 17:23:32 -0700 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2015-04-07 17:23:32 -0700 |
| commit | f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0 (patch) | |
| tree | 7a7156b56e9b9283ae0668491157bf1526077a3a /src/zap/zapper.cpp | |
| parent | 1afe5ce4f45045d724a4e129df4b816655d486fb (diff) | |
| download | coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.tar.gz coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.tar.bz2 coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.zip | |
Merge changes from parent branch
[tfs-changeset: 1448103]
Diffstat (limited to 'src/zap/zapper.cpp')
| -rw-r--r-- | src/zap/zapper.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp index 6cddacfc11..56835cac94 100644 --- a/src/zap/zapper.cpp +++ b/src/zap/zapper.cpp @@ -905,10 +905,6 @@ void Zapper::InitEE(BOOL fForceDebug, BOOL fForceProfile, BOOL fForceInstrument) static ConfigDWORD useRyuJitValue; bool fUseRyuJit = (useRyuJitValue.val(CLRConfig::INTERNAL_UseRyuJit) == 1); - // ****** TODO: Until the registry value is set by the .NET 4.6 installer, we pretend .NET 4.6 has been installed, which causes - // ****** RyuJit to be used by default. - fUseRyuJit = true; - if (!fUseRyuJit) // Do we need to fall back to JIT64 for NGEN? { LPCWSTR pwzJitName = MAKEDLLNAME_W(L"compatjit"); |