diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-01 12:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 12:05:34 +0100 |
| commit | bc3bf793a91bcf2f39edd1134d9f174475578794 (patch) | |
| tree | e9fa138cd9fa296147b7ea5a4b67274669ece51f | |
| parent | 8df449100a3f9dde511d05087bef60a07fadefde (diff) | |
| parent | 8f9914bd94fced7f60dff40e14fe734203d7c5d4 (diff) | |
Merge pull request #17135 from Faless/server_bsd_fix
Fix server build on FreeBSD
| -rw-r--r-- | platform/server/detect.py | 8 | ||||
| -rw-r--r-- | platform/server/platform_config.h | 6 | ||||
| -rw-r--r-- | platform/x11/crash_handler_x11.cpp | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index 43aad4ad26..c9a886ad6c 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -1,4 +1,5 @@ import os +import platform import sys @@ -132,7 +133,12 @@ def configure(env): env.Append(CPPPATH=['#platform/server']) env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED']) env.Append(LIBS=['pthread']) - env.Append(LIBS=['dl']) + + 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']: diff --git a/platform/server/platform_config.h b/platform/server/platform_config.h index af4cf07393..2fa8eda337 100644 --- a/platform/server/platform_config.h +++ b/platform/server/platform_config.h @@ -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 diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index 43b9051ea7..d39fc33f81 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -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 |