summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2017-04-27 17:46:47 (GMT)
committerGitHub <noreply@github.com>2017-04-27 17:46:47 (GMT)
commitc983bb86ddf46916206efc7cd5bc942ec8b834cb (patch)
tree9d3898bc06cabae6fd7207ccf197ce76892b7b38 /src/tools
parent368ee30f34fda812d8d936dff4d59b91270453c1 (diff)
downloadcoreclr-c983bb86ddf46916206efc7cd5bc942ec8b834cb.zip
coreclr-c983bb86ddf46916206efc7cd5bc942ec8b834cb.tar.gz
coreclr-c983bb86ddf46916206efc7cd5bc942ec8b834cb.tar.bz2
[WIP] Enable binding to CoreLib as NI image (#11040)
Enable binding to CoreLib as NI image
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/crossgen/crossgen.cpp27
1 files changed, 4 insertions, 23 deletions
diff --git a/src/tools/crossgen/crossgen.cpp b/src/tools/crossgen/crossgen.cpp
index 43e667b..954f4a4 100644
--- a/src/tools/crossgen/crossgen.cpp
+++ b/src/tools/crossgen/crossgen.cpp
@@ -311,35 +311,16 @@ void PopulateTPAList(SString path, LPCWSTR pwszMask, SString &refTPAList, bool f
bool fAddDelimiter = (refTPAList.GetCount() > 0)?true:false;
bool fAddFileToTPAList = true;
LPCWSTR pwszFilename = folderEnumerator.GetFileName();
- if (fCompilingMscorlib)
+
+ // No NIs are supported when creating NI images (other than NI of System.Private.CoreLib.dll).
+ if (!fCreatePDB)
{
- // When compiling CoreLib, no ".ni.dll" should be on the TPAList.
+ // Only CoreLib's ni.dll should be in the TPAList for the compilation of non-mscorlib assemblies.
if (StringEndsWith((LPWSTR)pwszFilename, W(".ni.dll")))
{
fAddFileToTPAList = false;
}
}
- else
- {
- // When creating PDBs, we must ensure that .ni.dlls are in the TPAList
- if (!fCreatePDB)
- {
- // Only CoreLib's ni.dll should be in the TPAList for the compilation of non-mscorlib assemblies.
- if (StringEndsWith((LPWSTR)pwszFilename, W(".ni.dll")))
- {
- if (!StringEndsWith((LPWSTR)pwszFilename, CoreLibName_NI_W))
- {
- fAddFileToTPAList = false;
- }
- }
- }
-
- // Ensure that CoreLib's IL version is also not on the TPAlist for this case.
- if (StringEndsWith((LPWSTR)pwszFilename, CoreLibName_IL_W))
- {
- fAddFileToTPAList = false;
- }
- }
if (fAddFileToTPAList)
{