Fix server build on FreeBSD

(cherry picked from commit 8f9914bd94)
This commit is contained in:
Fabio Alessandrelli 2018-03-01 01:25:16 +01:00 committed by Hein-Pieter van Braam
parent 675899a521
commit 44b206a3fa
3 changed files with 15 additions and 2 deletions

View file

@ -1,4 +1,5 @@
import os
import platform
import sys
@ -135,8 +136,13 @@ def configure(env):
env.Append(CPPPATH=['#platform/server'])
env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED'])
env.Append(LIBS=['pthread'])
if (platform.system() == "Linux"):
env.Append(LIBS=['dl'])
if (platform.system().find("BSD") >= 0):
env.Append(LIBS=['execinfo'])
# Link those statically for portability
if env['use_static_cpp']:
env.Append(LINKFLAGS=['-static-libgcc', '-static-libstdc++'])

View file

@ -28,4 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef __linux__
#include <alloca.h>
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <stdlib.h>
#define PTHREAD_BSD_SET_NAME
#endif

View file

@ -32,8 +32,9 @@
#define CRASH_HANDLER_ENABLED 1
#endif
#include "crash_handler_x11.h"
#include "main/main.h"
#include "os_x11.h"
#include "os/os.h"
#include "project_settings.h"
#ifdef CRASH_HANDLER_ENABLED