diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-01-03 11:22:13 -0800 |
|---|---|---|
| committer | Eric Mellino <erme@microsoft.com> | 2017-01-03 11:22:13 -0800 |
| commit | f90e95606c8c335327c0729c16a90fbf5dddcfd1 (patch) | |
| tree | 24dc066e8f3a3c379588414af45c6ad0092ec9b1 /src/coreclr | |
| parent | f8d72ed4407b01a06ca9a3495e06da6b6be8538d (diff) | |
| download | coreclr-f90e95606c8c335327c0729c16a90fbf5dddcfd1.tar.gz coreclr-f90e95606c8c335327c0729c16a90fbf5dddcfd1.tar.bz2 coreclr-f90e95606c8c335327c0729c16a90fbf5dddcfd1.zip | |
Only add CORE_LIBRARIES to TPA list if it is different from clrFilesAbsolutePath
This avoids placing duplicate entries on the TPA list.
Diffstat (limited to 'src/coreclr')
| -rw-r--r-- | src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp index bedf7e331b..723711e0ee 100644 --- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp +++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp @@ -321,7 +321,10 @@ int ExecuteManagedAssembly( { nativeDllSearchDirs.append(":"); nativeDllSearchDirs.append(coreLibraries); - AddFilesFromDirectoryToTpaList(coreLibraries, tpaList); + if (std::strcmp(coreLibraries, clrFilesAbsolutePath) != 0) + { + AddFilesFromDirectoryToTpaList(coreLibraries, tpaList); + } } nativeDllSearchDirs.append(":"); nativeDllSearchDirs.append(clrFilesAbsolutePath); |