SWDEV-518221 - Don't link against libamd_comgr.so at runtime
Convention is to always link against .so.* at runtime.
Having it link against .so will break on systems that package
the .so files in their dev/devel package.
This issue was found when building ROCm 6.4 for Fedora.
Commiting on behalf of GitHub user Mystro256
[ROCm/clr commit: 6b12154583]
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
fbabd2b69d
Коммит
dc1c1e3199
@@ -52,16 +52,16 @@ bool Comgr::LoadLib(bool is_versioned) {
|
||||
comgr_versioned_name = kComgrPrefix + major_version + minor_version + std::string(".dll");
|
||||
|
||||
static const char* comgr_lib_name =
|
||||
LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so"),
|
||||
WINDOWS_SWITCH(comgr_versioned_name.c_str(), "libamd_comgr.so"));
|
||||
LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so.3"),
|
||||
WINDOWS_SWITCH(comgr_versioned_name.c_str(), "libamd_comgr.so.3"));
|
||||
cep_.handle = Os::loadLibrary(comgr_lib_name);
|
||||
#endif
|
||||
} else {
|
||||
std::string comgr_major_dll = "amd_comgr_" +
|
||||
std::to_string(AMD_COMGR_INTERFACE_VERSION_MAJOR) + ".dll";
|
||||
static const char* comgr_lib_name =
|
||||
LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so"),
|
||||
WINDOWS_SWITCH(comgr_major_dll.c_str(), "libamd_comgr.so"));
|
||||
LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so.3"),
|
||||
WINDOWS_SWITCH(comgr_major_dll.c_str(), "libamd_comgr.so.3"));
|
||||
cep_.handle = Os::loadLibrary(comgr_lib_name);
|
||||
}
|
||||
if (nullptr == cep_.handle) {
|
||||
|
||||
Ссылка в новой задаче
Block a user