diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-06-09 13:28:50 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-06-09 13:28:50 -0700 |
| commit | ec397f78139a1c882d3d7c088afd70399f30cc87 (patch) | |
| tree | 67ee8d6fbdc71955a37ff40091c4a289f5fd4c27 /src | |
| parent | 11cacdc45583ae60bf5a3e69cd0f86b03020423c (diff) | |
| parent | fec2c9c804023b133f5cb17b0a8a045f7a832144 (diff) | |
| download | coreclr-ec397f78139a1c882d3d7c088afd70399f30cc87.tar.gz coreclr-ec397f78139a1c882d3d7c088afd70399f30cc87.tar.bz2 coreclr-ec397f78139a1c882d3d7c088afd70399f30cc87.zip | |
Merge pull request #1121 from erozenfeld/CrossgenFix
Fix crossgen so that it doesn't attempt to get clr callbacks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/zap/zapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp index cdbc225f8e..b0a5aca8bd 100644 --- a/src/zap/zapper.cpp +++ b/src/zap/zapper.cpp @@ -761,7 +761,7 @@ void Zapper::LoadAndInitializeJITForNgen(LPCWSTR pwzJitName, OUT HINSTANCE* phJi ThrowLastError(); } -#if defined(FEATURE_CORECLR) || !defined(SELF_NO_HOST) || defined(DACCESS_COMPILE) +#if (defined(FEATURE_CORECLR) || !defined(SELF_NO_HOST)) && !defined(CROSSGEN_COMPILE) typedef void (__stdcall* pSxsJitStartup) (CoreClrCallbacks const & cccallbacks); pSxsJitStartup sxsJitStartupFn = (pSxsJitStartup) GetProcAddress(*phJit, "sxsJitStartup"); if (sxsJitStartupFn == NULL) |