From fec2c9c804023b133f5cb17b0a8a045f7a832144 Mon Sep 17 00:00:00 2001 From: Eugene Rozenfeld Date: Tue, 9 Jun 2015 11:45:12 -0700 Subject: [PATCH] Fix crossgen so that it doesn't attempt to get clr callbacks. This was preventing llilc from being used as an ngen jit. The fix is from Jan Kotas. --- src/zap/zapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp index cdbc225..b0a5aca 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) -- 2.7.4