diff options
| author | Kyungwoo Lee <kyulee@microsoft.com> | 2015-12-08 14:26:54 -0800 |
|---|---|---|
| committer | Kyungwoo Lee <kyulee@microsoft.com> | 2015-12-09 17:43:10 -0800 |
| commit | c09a2320ed6184f2ad0f0c59cdd6884c76c9e038 (patch) | |
| tree | ec7fb163cb438237d19fdc849d121f84c3dbdac5 /src/ilasm/main.cpp | |
| parent | d1633211ee01ed05f467cacd36418f313e7a3d71 (diff) | |
| download | coreclr-c09a2320ed6184f2ad0f0c59cdd6884c76c9e038.tar.gz coreclr-c09a2320ed6184f2ad0f0c59cdd6884c76c9e038.tar.bz2 coreclr-c09a2320ed6184f2ad0f0c59cdd6884c76c9e038.zip | |
Enable ILASM for Windows
This enables ILASM/mscorpe on CoreCLR for Windows.
1. Fusion/StrongName(Full Sign) dependencies are removed since these are not CoreCLR features.
2. mscorpe is statically built/linked to ilasm.
3. asmparse.c is auto-generated by an internal version of yacc so I added it under prebuilt directory for now. Will create an issue so that we can build it using a standard tool like bison.
Diffstat (limited to 'src/ilasm/main.cpp')
| -rw-r--r-- | src/ilasm/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ilasm/main.cpp b/src/ilasm/main.cpp index 2bb06612a6..978f827188 100644 --- a/src/ilasm/main.cpp +++ b/src/ilasm/main.cpp @@ -722,6 +722,7 @@ extern "C" int _cdecl wmain(int argc, __in WCHAR **argv) exitval = 1; pParser->msg("Failed to write output file, error code=0x%08X\n",hr); } +#ifndef FEATURE_CORECLR else if (pAsm->m_pManifest->m_sStrongName.m_fFullSign) { // Strong name sign the resultant assembly. @@ -732,6 +733,7 @@ extern "C" int _cdecl wmain(int argc, __in WCHAR **argv) pParser->msg("Failed to strong name sign output file, error code=0x%08X\n",hr); } } +#endif if(bClock) cw.cEnd = GetTickCount(); #define ENC_ENABLED #ifdef ENC_ENABLED |