Fix crossgen so that it doesn't attempt to get clr callbacks.
authorEugene Rozenfeld <erozen@microsoft.com>
Tue, 9 Jun 2015 18:45:12 +0000 (11:45 -0700)
committerEugene Rozenfeld <erozen@microsoft.com>
Tue, 9 Jun 2015 18:45:12 +0000 (11:45 -0700)
This was preventing llilc from being used as an ngen jit. The fix is from Jan Kotas.

src/zap/zapper.cpp

index cdbc225..b0a5aca 100644 (file)
@@ -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)