diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-01-12 21:10:11 -0800 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-01-12 21:10:11 -0800 |
| commit | c3d19580256c0163094cf3209685a2d5b05765a2 (patch) | |
| tree | 9b70e3eb641f703d7201fe15da25a3ceedc6395f /src/binder | |
| parent | 1a8bbf64804f0e61a5abb668083e6b8e5a1b1cde (diff) | |
| download | coreclr-c3d19580256c0163094cf3209685a2d5b05765a2.tar.gz coreclr-c3d19580256c0163094cf3209685a2d5b05765a2.tar.bz2 coreclr-c3d19580256c0163094cf3209685a2d5b05765a2.zip | |
Fix arm specific build break pertaining to AssemblyLoadContext changes.
[tfs-changeset: 1564035]
Diffstat (limited to 'src/binder')
| -rw-r--r-- | src/binder/clrprivbindercoreclr.cpp | 4 | ||||
| -rw-r--r-- | src/binder/inc/clrprivbindercoreclr.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/binder/clrprivbindercoreclr.cpp b/src/binder/clrprivbindercoreclr.cpp index 6235072f11..238c5225cf 100644 --- a/src/binder/clrprivbindercoreclr.cpp +++ b/src/binder/clrprivbindercoreclr.cpp @@ -73,7 +73,7 @@ Exit:; return hr; } -#if !defined(CROSSGEN_COMPILE) +#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN) HRESULT CLRPrivBinderCoreCLR::BindUsingPEImage( /* in */ PEImage *pPEImage, /* in */ BOOL fIsNativeImage, /* [retval][out] */ ICLRPrivAssembly **ppAssembly) @@ -145,7 +145,7 @@ Exit:; return hr; } -#endif // !defined(CROSSGEN_COMPILE) +#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN) HRESULT CLRPrivBinderCoreCLR::VerifyBind(IAssemblyName *AssemblyName, ICLRPrivAssembly *pAssembly, diff --git a/src/binder/inc/clrprivbindercoreclr.h b/src/binder/inc/clrprivbindercoreclr.h index 36ecaf4195..4d98c9b55a 100644 --- a/src/binder/inc/clrprivbindercoreclr.h +++ b/src/binder/inc/clrprivbindercoreclr.h @@ -66,10 +66,13 @@ public: #ifndef CROSSGEN_COMPILE HRESULT PreBindByteArray(PEImage *pPEImage, BOOL fInspectionOnly); +#endif // CROSSGEN_COMPILE + +#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN) HRESULT BindUsingPEImage( /* in */ PEImage *pPEImage, /* in */ BOOL fIsNativeImage, /* [retval][out] */ ICLRPrivAssembly **ppAssembly); -#endif // CROSSGEN_COMPILE +#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN) HRESULT BindAssemblyByNameWorker( BINDER_SPACE::AssemblyName *pAssemblyName, |