diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 17:57:23 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 17:57:23 -0700 |
| commit | 6e6247711d5c12f130b065fcedd110ff3e612bcf (patch) | |
| tree | 0242d90a2c058cf3ce978eef00cd27b76c98465d /src/zap | |
| parent | 8b48e4378b9825f91bbe50cb94f97519c1350737 (diff) | |
| download | coreclr-6e6247711d5c12f130b065fcedd110ff3e612bcf.tar.gz coreclr-6e6247711d5c12f130b065fcedd110ff3e612bcf.tar.bz2 coreclr-6e6247711d5c12f130b065fcedd110ff3e612bcf.zip | |
Fix build break introduced by https://github.com/dotnet/coreclr/commit/140396f479d5d33bca0daef1f072eef4992ed78e
[tfs-changeset: 1599439]
Diffstat (limited to 'src/zap')
| -rw-r--r-- | src/zap/zapper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp index 27d99c7f90..a211a317c4 100644 --- a/src/zap/zapper.cpp +++ b/src/zap/zapper.cpp @@ -695,8 +695,10 @@ void Zapper::LoadAndInitializeJITForNgen(LPCWSTR pwzJitName, OUT HINSTANCE* phJi HRESULT hr = E_FAIL; -#ifdef FEATURE_CORECLR +#if defined(FEATURE_CORECLR) || defined(FEATURE_MERGE_JIT_AND_ENGINE) // TODO_DJIT: Currently, we are looking up the JIT from the same location as CoreCLR. The path needs to be passed by the caller. + // + // Note: FEATURE_MERGE_JIT_AND_ENGINE is defined for the Desktop crossgen compilation as well. PathString CoreClrFolder; extern HINSTANCE g_hThisInst; if (WszGetModuleFileName(g_hThisInst, CoreClrFolder)) |