diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-11 07:41:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 07:41:29 +0100 |
| commit | 61e89dcd4aa57853e60402839459de77143462ce (patch) | |
| tree | 797e4c242581ad37dc5e5d0bb6abed89fe02005a | |
| parent | 435cced7d8fbc80e6842d7c171a87d4db1e64fe4 (diff) | |
| parent | 589eb80a90e947469b0261420f8bba30e867ff0a (diff) | |
Merge pull request #34250 from flyingpimonster/fix-musl
Fix build on musl-based systems
| -rw-r--r-- | thirdparty/vhacd/0003-fix-musl-build.patch | 15 | ||||
| -rw-r--r-- | thirdparty/vhacd/inc/vhacdMutex.h | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/thirdparty/vhacd/0003-fix-musl-build.patch b/thirdparty/vhacd/0003-fix-musl-build.patch new file mode 100644 index 0000000000..67af8546f3 --- /dev/null +++ b/thirdparty/vhacd/0003-fix-musl-build.patch @@ -0,0 +1,15 @@ +diff --git a/thirdparty/vhacd/inc/vhacdMutex.h b/thirdparty/vhacd/inc/vhacdMutex.h +index 6b09259200..d587dd6387 100644 +--- a/thirdparty/vhacd/inc/vhacdMutex.h ++++ b/thirdparty/vhacd/inc/vhacdMutex.h +@@ -71,7 +71,9 @@ + #include <pthread.h> + #endif + +-#if defined(__APPLE__) ++// -- GODOT start -- ++#if defined(__APPLE__) || !defined(__GLIBC__) ++// -- GODOT end -- + #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE + #endif + diff --git a/thirdparty/vhacd/inc/vhacdMutex.h b/thirdparty/vhacd/inc/vhacdMutex.h index 6b09259200..d587dd6387 100644 --- a/thirdparty/vhacd/inc/vhacdMutex.h +++ b/thirdparty/vhacd/inc/vhacdMutex.h @@ -71,7 +71,9 @@ #include <pthread.h> #endif -#if defined(__APPLE__) +// -- GODOT start -- +#if defined(__APPLE__) || !defined(__GLIBC__) +// -- GODOT end -- #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #endif |