Changed the libclrjit_ file name of the riscv64(universal->unix)

Change-Id: Ia886aed058deb6dbe507aa6cd0325029d2a3d8ab

diff --git a/NativeLauncher/CMakeLists.txt b/NativeLauncher/CMakeLists.txt
index 7a3e47759ea6e0d60227e8304985701796d8679a..e0914137470fb0c52061104378fcd2bc19ca83d6 100644 (file)
--- a/NativeLauncher/CMakeLists.txt
+++ b/NativeLauncher/CMakeLists.txt
@@ -52,6 +52,10 @@ IF(DEFINED DOTNET_DIR)
     SET(EXTRA_CFLAGS_COMMON "${EXTRA_CFLAGS_COMMON} -DDOTNET_DIR=${DOTNET_DIR}")
 ENDIF(DEFINED DOTNET_DIR)
 
+IF(DEFINED DOTNET_MIC_DIR)
+    SET(EXTRA_CFLAGS_COMMON "${EXTRA_CFLAGS_COMMON} -DDOTNET_MIC_DIR=${DOTNET_MIC_DIR}")
+ENDIF(DEFINED DOTNET_MIC_DIR)
+
 IF(DEFINED READ_ONLY_APP_UPDATE_DIR)
     SET(EXTRA_CFLAGS_COMMON "${EXTRA_CFLAGS_COMMON} -DREAD_ONLY_APP_UPDATE_DIR=${READ_ONLY_APP_UPDATE_DIR}")
 ENDIF(DEFINED READ_ONLY_APP_UPDATE_DIR)

diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc
index 4d2e3d297da46f3b25d38c884dd775293c6885db..c66e0454332ecd74d1c8d8e715abc1cf56ccf938 100644 (file)
--- a/NativeLauncher/tool/ni_common.cc
+++ b/NativeLauncher/tool/ni_common.cc
@@ -56,6 +56,7 @@
 #define __STR(x) __XSTR(x)
 static const char* __NATIVE_LIB_DIR = __STR(NATIVE_LIB_DIR);
 static const char* __DOTNET_DIR = __STR(DOTNET_DIR);
+static const char* __DOTNET_MIC_DIR = __STR(DOTNET_MIC_DIR);
 static const char* __RUNTIME_DIR = __STR(RUNTIME_DIR);
 static const char* __READ_ONLY_APP_UPDATE_DIR = __STR(READ_ONLY_APP_UPDATE_DIR);
 
@@ -898,15 +899,16 @@ ni_error_e initNICommon()
        char *env = nullptr;
        env = getenv("MIC_CROSSGEN2_ENABLED");
        if (env != nullptr && !strcmp(env, "1")) {
-               CORERUN_CMD = std::string("/opt/usr/dotnet/mic/crossgen2");
                CROSSGEN2_PATH = "";
-               CLRJIT_PATH = std::string("/opt/usr/dotnet/mic/libclrjit_");
-               if (strstr(bf::read_symlink(__RUNTIME_DIR).string().c_str(), "6.0.") != NULL) {
-                       CLRJIT_PATH.append("unix_"); //6.0.X
-                       CLRJIT_PATH.append(ARCHITECTURE_IDENTIFIER);
-               } else {
+               CORERUN_CMD = concatPath(__DOTNET_MIC_DIR, "crossgen2");
+               CLRJIT_PATH = concatPath(__DOTNET_MIC_DIR, "libclrjit_");
+               if (!strstr(bf::read_symlink(__RUNTIME_DIR).string().c_str(), "6.0.") &&
+                       (!strcmp(ARCHITECTURE_IDENTIFIER_GENERAL, "arm") || !strcmp(ARCHITECTURE_IDENTIFIER_GENERAL, "arm64"))) {
                        CLRJIT_PATH.append("universal_");
                        CLRJIT_PATH.append(ARCHITECTURE_IDENTIFIER_GENERAL);
+               } else {
+                       CLRJIT_PATH.append("unix_"); //6.0.X or 8.0.X for riscv64
+                       CLRJIT_PATH.append(ARCHITECTURE_IDENTIFIER);
                }
                CLRJIT_PATH.append("_x64.so");
        }

diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index c5bf5b1c7012313f2f92b041797e889266b4f77c..fb234b05fab870af55c5539b3b5af921b222fa89 100644 (file)
--- a/packaging/dotnet-launcher.spec
+++ b/packaging/dotnet-launcher.spec
@@ -57,6 +57,7 @@ Requires(preun): /usr/bin/systemctl
 %define _install_plugin_dir /etc/package-manager/parserlib
 %define _native_lib_dir /usr/share/dotnet.tizen/lib
 %define _dotnet_dir /opt/usr/dotnet
+%define _dotnet_mic_dir /opt/usr/dotnet/mic
 %define _readonly_app_update_dir /opt/usr/dotnet/apps
 %define _readonly_tac_dir /usr/share/dotnet.tizen/tac
 %define _system_base_addr_file /opt/usr/dotnet.system.base.addr
@@ -161,6 +162,7 @@ cmake \
        -DINSTALL_MDPLUGIN_DIR=%{_install_mdplugin_dir} \
        -DINSTALL_PLUGIN_DIR=%{_install_plugin_dir} \
        -DDOTNET_DIR=%{_dotnet_dir} \
+       -DDOTNET_MIC_DIR=%{_dotnet_mic_dir} \
        -DREAD_ONLY_APP_UPDATE_DIR=%{_readonly_app_update_dir} \
        -DREAD_ONLY_TAC_DIR=%{_readonly_tac_dir} \
        -DVERSION=%{version} \
@@ -188,6 +190,7 @@ mv Managed/Tizen.Runtime/bin/Release/Tizen.Runtime.dll %{buildroot}%{_framework_
 mv Managed/Tizen.Runtime/bin/Release/Tizen.Runtime.pdb %{buildroot}%{_framework_dir}
 
 mkdir -p %{buildroot}%{_dotnet_dir}
+mkdir -p %{buildroot}%{_dotnet_mic_dir}
 mkdir -p %{buildroot}%{_readonly_app_update_dir}
 mkdir -p %{buildroot}%{_readonly_tac_dir}
 mkdir -p %{buildroot}%{_native_lib_dir}
@@ -242,6 +245,7 @@ chsmack -a User /usr/bin/dotnet-uts-loader
 /usr/share/parser-plugins/dotnet-launcher.info
 %{_framework_dir}/Tizen.Runtime.dll
 %{_dotnet_dir}
+%{_dotnet_mic_dir}
 %{_readonly_app_update_dir}
 %{_readonly_tac_dir}
 %{_tizen_preload_dir}