Skip to content

Commit b2ad4f7

Browse files
committed
Fix startup crash in x86 Linux builds
1 parent 2e640f4 commit b2ad4f7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Server/core/CDynamicLibrary.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
8686
LocalFree ( lpMsgBuf );
8787
}
8888
#else
89-
m_hModule = dlopen ( szFilename, RTLD_NOW );
89+
m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
9090

9191
// Output error if needed
9292
if ( !m_hModule )

Server/launcher/CDynamicLibrary.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
3939
#ifdef WIN32
4040
m_hModule = LoadLibrary ( szFilename );
4141
#else
42-
m_hModule = dlopen ( szFilename, RTLD_NOW );
42+
m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
4343

4444
// Output error if needed
4545
if ( !m_hModule )

Server/mods/deathmatch/logic/CDynamicLibrary.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
4646
}
4747

4848
#else
49-
m_hModule = dlopen ( szFilename, RTLD_NOW );
49+
m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
5050

5151
// Output error if needed
5252
if ( !m_hModule )

Server/mods/deathmatch/logic/lua/CLuaModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int CLuaModule::_LoadModule ( void )
7979
strError = SString( "%d", GetLastError() );
8080
SetCurrentDirectory( strSavedCurrentDirectory );
8181
#else
82-
m_hModule = dlopen ( m_szFileName, RTLD_NOW );
82+
m_hModule = dlopen ( m_szFileName, RTLD_NOW | RTLD_DEEPBIND );
8383
if ( m_hModule == NULL )
8484
strError = dlerror();
8585
#endif

0 commit comments

Comments
 (0)