diff options
author | Eric Mellino <erme@microsoft.com> | 2016-12-29 14:53:46 -0800 |
---|---|---|
committer | Eric Mellino <erme@microsoft.com> | 2016-12-29 14:53:46 -0800 |
commit | f8d72ed4407b01a06ca9a3495e06da6b6be8538d (patch) | |
tree | 0f347c67a819f2c70e8e6691b1056b532dec3752 /src/coreclr | |
parent | 2e67c8f8a95dddd5716e1b60705ff63c5a09a805 (diff) | |
download | coreclr-f8d72ed4407b01a06ca9a3495e06da6b6be8538d.tar.gz coreclr-f8d72ed4407b01a06ca9a3495e06da6b6be8538d.tar.bz2 coreclr-f8d72ed4407b01a06ca9a3495e06da6b6be8538d.zip |
Add CORE_LIBRARIES to the TPA list if it's set in unixcoreruncommon
Diffstat (limited to 'src/coreclr')
-rw-r--r-- | src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp index d7186d7a29..bedf7e331b 100644 --- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp +++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp @@ -313,6 +313,7 @@ int ExecuteManagedAssembly( std::string appPath; GetDirectory(managedAssemblyAbsolutePath, appPath); + std::string tpaList; // Construct native search directory paths std::string nativeDllSearchDirs(appPath); char *coreLibraries = getenv("CORE_LIBRARIES"); @@ -320,11 +321,11 @@ int ExecuteManagedAssembly( { nativeDllSearchDirs.append(":"); nativeDllSearchDirs.append(coreLibraries); + AddFilesFromDirectoryToTpaList(coreLibraries, tpaList); } nativeDllSearchDirs.append(":"); nativeDllSearchDirs.append(clrFilesAbsolutePath); - std::string tpaList; AddFilesFromDirectoryToTpaList(clrFilesAbsolutePath, tpaList); void* coreclrLib = dlopen(coreClrDllPath.c_str(), RTLD_NOW | RTLD_LOCAL); |