godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34250 from flyingpimonster/fix-musl

Browse Source 
Fix build on musl-based systems
This commit is contained in:
Rémi Verschelde 2019-12-11 07:41:29 +01:00 committed by GitHub
commit 61e89dcd4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
thirdparty/vhacd/0003-fix-musl-build.patch vendored Normal file
View File

@ -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

4
thirdparty/vhacd/inc/vhacdMutex.h vendored
View File

@ -71,7 +71,9 @@
#include <pthread.h> #include <pthread.h>
#endif #endif
#if defined(__APPLE__) // -- GODOT start --
#if defined(__APPLE__) || !defined(__GLIBC__)
// -- GODOT end --
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
#endif #endif