diff options
| author | John Chen (JOCHEN7) <jochen@microsoft.com> | 2015-04-28 13:20:01 -0700 |
|---|---|---|
| committer | John Chen (JOCHEN7) <jochen@microsoft.com> | 2015-04-28 23:15:22 -0700 |
| commit | e0c80c5f5c7d395d79aa350a26f46101a78af95d (patch) | |
| tree | ec611fcee20f99810a6704c26c2e790884d42976 /src/zap/zapper.cpp | |
| parent | 1827eb2ae3201ccba95ca228d657041c8af3410c (diff) | |
| download | coreclr-e0c80c5f5c7d395d79aa350a26f46101a78af95d.tar.gz coreclr-e0c80c5f5c7d395d79aa350a26f46101a78af95d.tar.bz2 coreclr-e0c80c5f5c7d395d79aa350a26f46101a78af95d.zip | |
Build crossgen for Linux
- Crossgen is now built as part of coreclr
- Crossgen successfully compiles mscorlib.dll
- Resulting mscorlib.ni.dll not yet usable
Diffstat (limited to 'src/zap/zapper.cpp')
| -rw-r--r-- | src/zap/zapper.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp index 56835cac94..1985f83062 100644 --- a/src/zap/zapper.cpp +++ b/src/zap/zapper.cpp @@ -24,7 +24,9 @@ #endif #include "clr/fs/dir.h" +#ifdef FEATURE_FUSION #include "ngenparser.inl" +#endif /* --------------------------------------------------------------------------- * * Error Macros @@ -940,8 +942,8 @@ void Zapper::InitEE(BOOL fForceDebug, BOOL fForceProfile, BOOL fForceInstrument) { // Allow a second jit to be loaded into the system. // - LPWSTR altName; - hr = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_AltJitName, &altName); + LPCWSTR altName; + hr = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_AltJitName, (LPWSTR*)&altName); if (FAILED(hr)) { Error(W("Unable to load alternative Jit Compiler\r\n")); @@ -3504,6 +3506,7 @@ void Zapper::DefineOutputAssembly(SString& strAssemblyName, ULONG * pHashAlgId) ThrowHR(HRESULT_FROM_WIN32(ERROR_INVALID_NAME)); } +#ifndef PLATFORM_UNIX // // We always need a hash since our assembly module is separate from the manifest. // Use MD5 by default. @@ -3511,6 +3514,7 @@ void Zapper::DefineOutputAssembly(SString& strAssemblyName, ULONG * pHashAlgId) if (hashAlgId == 0) hashAlgId = CALG_MD5; +#endif mdAssembly tkEmitAssembly; IfFailThrow(m_pAssemblyEmit->DefineAssembly(pbPublicKey, cbPublicKey, hashAlgId, |