diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-11-13 18:33:24 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-11-13 18:33:24 (GMT) |
| commit | 8fbe000639d408f61ba216bbeb42d4a55e45a00a (patch) | |
| tree | db7b5888c7f3202a59d23389ed643205e94a63e4 | |
| parent | 2d2bf76e9132693e6c7d424f646dc4c92eb17434 (diff) | |
| parent | 2cc9e68596005f5e742b5aae0bb8b73cd15cf367 (diff) | |
Merge pull request #368 from dremon/master
MinGW: add C++11 posix threads support
| -rw-r--r-- | config/libc.in | 14 | ||||
| -rw-r--r-- | config/libc/mingw.in | 4 | ||||
| -rw-r--r-- | scripts/build/libc/mingw.sh | 27 |
3 files changed, 42 insertions, 3 deletions
diff --git a/config/libc.in b/config/libc.in index 4cc7530..e1eabd2 100644 --- a/config/libc.in +++ b/config/libc.in @@ -32,6 +32,10 @@ config LIBC_SUPPORT_THREADS_LT bool select LIBC_SUPPORT_THREADS_ANY +config LIBC_SUPPORT_THREADS_POSIX + bool + select LIBC_SUPPORT_THREADS_ANY + config LIBC_SUPPORT_THREADS_NONE bool @@ -51,8 +55,9 @@ choice bool prompt "Threading implementation to use:" default THREADS_NATIVE if LIBC_SUPPORT_THREADS_NATIVE - default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT && ! LIBC_SUPPORT_THREADS_NATIVE - default THREADS_NONE if ! LIBC_SUPPORT_THREADS_ANY + default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT + default THREADS_THREADS_POSIX if LIBC_SUPPORT_THREADS_POSIX + default THREADS_NONE config THREADS_NATIVE bool @@ -70,6 +75,11 @@ config THREADS_LT prompt "linuxthreads" depends on LIBC_SUPPORT_THREADS_LT +config THREADS_POSIX + bool + prompt "posix" + depends on LIBC_SUPPORT_THREADS_POSIX + config THREADS_NONE bool prompt "none" diff --git a/config/libc/mingw.in b/config/libc/mingw.in index 88088e9..45b6971 100644 --- a/config/libc/mingw.in +++ b/config/libc/mingw.in @@ -3,12 +3,14 @@ ## depends on WINDOWS ## ## select LIBC_SUPPORT_THREADS_NATIVE +## select LIBC_SUPPORT_THREADS_POSIX ## select CC_CORE_PASS_2_NEEDED ## ## help The de-facto standard for Mingw distributions. config THREADS - default "win32" + default "win32" if THREADS_NATIVE + default "posix" if THREADS_POSIX choice bool diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index 44ca008..e2b781d 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -110,8 +110,35 @@ do_libc() { CT_DoExecLog ALL ${make} install DESTDIR=${CT_SYSROOT_DIR} CT_EndStep + + if [ "${CT_THREADS}" = "posix" ]; then + do_pthreads + fi } do_libc_post_cc() { : } + +do_pthreads() { + CT_DoStep INFO "Building mingw-w64-winpthreads files" + + CT_DoLog EXTRA "Configuring mingw-w64-winpthreads" + + CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-winpthreads" + + CT_DoExecLog CFG \ + "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-libraries/winpthreads/configure" \ + --with-sysroot=${CT_SYSROOT_DIR} \ + --prefix=${MINGW_INSTALL_PREFIX} \ + --build=${CT_BUILD} \ + --host=${CT_TARGET} \ + + CT_DoLog EXTRA "Building mingw-w64-winpthreads" + CT_DoExecLog ALL ${make} ${JOBSFLAGS} + + CT_DoLog EXTRA "Installing mingw-w64-winpthreads" + CT_DoExecLog ALL ${make} install DESTDIR=${CT_SYSROOT_DIR} + + CT_EndStep +} |