diff options
| author | Manu <manu-silicon@users.noreply.github.com> | 2016-05-25 11:21:23 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-05-24 19:21:23 -0700 |
| commit | 31031a3e21e6cbe227b99d9febcfaa554a8774d1 (patch) | |
| tree | 41a8c9f017f2d1f9352c8a8e9e2d874c96e89431 /src/coreclr | |
| parent | a22c755549f6c472af861d7b1eaef918db9a0041 (diff) | |
| download | coreclr-31031a3e21e6cbe227b99d9febcfaa554a8774d1.tar.gz coreclr-31031a3e21e6cbe227b99d9febcfaa554a8774d1.tar.bz2 coreclr-31031a3e21e6cbe227b99d9febcfaa554a8774d1.zip | |
Support the CORE_LIBRARIES environment variable on Unix (#5112)
Mimic the Windows behavior by adding to the search path of native dlls
the content of the CORE_LIBRARIES environment variable.
Diffstat (limited to 'src/coreclr')
| -rw-r--r-- | src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp index b9e62fffeb..fb70c69ec0 100644 --- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp +++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp @@ -292,7 +292,14 @@ int ExecuteManagedAssembly( std::string appPath; GetDirectory(managedAssemblyAbsolutePath, appPath); + // Construct native search directory paths std::string nativeDllSearchDirs(appPath); + char *coreLibraries = getenv("CORE_LIBRARIES"); + if (coreLibraries) + { + nativeDllSearchDirs.append(":"); + nativeDllSearchDirs.append(coreLibraries); + } nativeDllSearchDirs.append(":"); nativeDllSearchDirs.append(clrFilesAbsolutePath); |