diff options
author | jiseob.jang <jiseob.jang@samsung.com> | 2017-09-07 13:16:07 +0900 |
---|---|---|
committer | CHUNSEOK LEE <chunseok.lee@samsung.com> | 2017-09-08 11:46:55 +0900 |
commit | a27dfe2057fe9d294b784f5f5be279ed6c5d6c22 (patch) | |
tree | 47415bfdd11796c44b4447ad8a5c8ac8c171ea69 /packaging/0022-Enable-loading-directly-ni-file-for-corerun-temporar.patch | |
parent | cb9516da9df966079e5a34490139eec68c38dafa (diff) | |
download | coreclr-a27dfe2057fe9d294b784f5f5be279ed6c5d6c22.tar.gz coreclr-a27dfe2057fe9d294b784f5f5be279ed6c5d6c22.tar.bz2 coreclr-a27dfe2057fe9d294b784f5f5be279ed6c5d6c22.zip |
CoreCLR version update to 2.0.0.12082submit/tizen_4.0/20170908.071156submit/tizen/20170908.060726submit/tizen/20170908.052937submit/tizen/20170908.025808accepted/tizen/unified/20170911.060309accepted/tizen/4.0/unified/20170913.003305
Change-Id: I72c9f2b7258c576be457df609e33af55e0beab88
Diffstat (limited to 'packaging/0022-Enable-loading-directly-ni-file-for-corerun-temporar.patch')
-rw-r--r-- | packaging/0022-Enable-loading-directly-ni-file-for-corerun-temporar.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/packaging/0022-Enable-loading-directly-ni-file-for-corerun-temporar.patch b/packaging/0022-Enable-loading-directly-ni-file-for-corerun-temporar.patch new file mode 100644 index 0000000000..077650bbba --- /dev/null +++ b/packaging/0022-Enable-loading-directly-ni-file-for-corerun-temporar.patch @@ -0,0 +1,32 @@ +From 327402c5c08bdbb3903735b20b76fe1d73819eb9 Mon Sep 17 00:00:00 2001 +From: Yongseop Kim <yons.kim@samsung.com> +Date: Tue, 5 Sep 2017 18:03:34 +0900 +Subject: [PATCH 22/23] Enable loading directly ni file for corerun temporarily + +--- + src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp +index f97f262..a1db5c1 100644 +--- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp ++++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp +@@ -314,6 +314,7 @@ int ExecuteManagedAssembly( + GetDirectory(managedAssemblyAbsolutePath, appPath); + + std::string tpaList; ++ /* + if (strlen(managedAssemblyAbsolutePath) > 0) + { + // Target assembly should be added to the tpa list. Otherwise corerun.exe +@@ -322,6 +323,7 @@ int ExecuteManagedAssembly( + tpaList = managedAssemblyAbsolutePath; + tpaList.append(":"); + } ++ */ + + // Construct native search directory paths + std::string nativeDllSearchDirs(appPath); +-- +1.9.1 + |