Skip to content

Commit 306a492

Browse files
committed
* made pthread an optional link. This is helpful because sometimes cmake can't find the library, but the linker can (for example when cross compiling to 32 bit with -m32)
1 parent 969c363 commit 306a492

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

.mulle/etc/env/environment-user-nat.sh

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/etc/env/tool.linux

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mulle/etc/sourcetree/config

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/reflect/_Libraries.cmake

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/reflect/_mulle-thread-include.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@
6060
// remove for platform : `mulle-sde dependency mark pthread no-platform-<uname>`
6161
// (use `mulle-sourcetree-to-c --unames` to list known values)
6262
# if ! defined( __ANDROID__) && ! defined( _WIN32)
63-
# include <pthread.h> // pthread
63+
# ifdef __has_include
64+
# if __has_include(<pthread.h>)
65+
# include <pthread.h> // pthread
66+
# define HAVE_LIB_PTHREAD
67+
# endif
68+
# endif
6469
#endif
6570

6671
#endif

0 commit comments

Comments
 (0)