diff options
| author | John Chen <jochen@microsoft.com> | 2015-10-26 08:48:06 -0700 |
|---|---|---|
| committer | John Chen <jochen@microsoft.com> | 2015-10-26 08:48:06 -0700 |
| commit | 28cd3d16bd9183a4ae792f644ac5637bc886d68d (patch) | |
| tree | d4e456073656f38c9cf5565926bf501ca1d2073a /src/utilcode | |
| parent | 83a78f96b95fd67c7d89516256ccb9cb9c909452 (diff) | |
| download | coreclr-28cd3d16bd9183a4ae792f644ac5637bc886d68d.tar.gz coreclr-28cd3d16bd9183a4ae792f644ac5637bc886d68d.tar.bz2 coreclr-28cd3d16bd9183a4ae792f644ac5637bc886d68d.zip | |
Fix a CrossGen assert on Linux
Resource string loading during CrossGen doesn't work on Linux.
Disable it for now. In many cases the loaded string isn't even used.
Diffstat (limited to 'src/utilcode')
| -rw-r--r-- | src/utilcode/sstring_com.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utilcode/sstring_com.cpp b/src/utilcode/sstring_com.cpp index 94cdd45c3b..791c6cdce2 100644 --- a/src/utilcode/sstring_com.cpp +++ b/src/utilcode/sstring_com.cpp @@ -39,7 +39,7 @@ HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::Resourc HRESULT hr = E_FAIL; -#ifndef FEATURE_UTILCODE_NO_DEPENDENCIES +#if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES) && !(defined(CROSSGEN_COMPILE) && defined(PLATFORM_UNIX)) if (pResourceDLL == NULL) { pResourceDLL = CCompRC::GetDefaultResourceDll(); |