diff options
| -rw-r--r-- | config/libc.in | 4 | ||||
| -rw-r--r-- | config/libc/mingw.in | 7 | ||||
| -rw-r--r-- | scripts/build/libc/mingw.sh | 30 |
3 files changed, 39 insertions, 2 deletions
diff --git a/config/libc.in b/config/libc.in index e1eabd20..cd3ccec8 100644 --- a/config/libc.in +++ b/config/libc.in @@ -55,8 +55,8 @@ choice bool prompt "Threading implementation to use:" default THREADS_NATIVE if LIBC_SUPPORT_THREADS_NATIVE - default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT - default THREADS_THREADS_POSIX if LIBC_SUPPORT_THREADS_POSIX + default THREADS_LT if LIBC_SUPPORT_THREADS_LT + default THREADS_POSIX if LIBC_SUPPORT_THREADS_POSIX default THREADS_NONE config THREADS_NATIVE diff --git a/config/libc/mingw.in b/config/libc/mingw.in index 6c33d2fb..0de5dacd 100644 --- a/config/libc/mingw.in +++ b/config/libc/mingw.in @@ -103,3 +103,10 @@ config MINGW_DIRECTX config MINGW_DDK bool prompt "Include DDK development files" + +config MINGW_TOOLS + bool + prompt "Include the companion tools" + help + build the companion tools with mingw such as widl, gendef, + and genpeimg diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index 705f8c95..fddf1f7d 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -83,6 +83,31 @@ do_check_mingw_vendor_tuple() fi } +do_mingw_tools() { + for f in gendef genidl genlib genpeimg widl + do + if [[ ! -d "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}" ]]; then + continue; + fi + + CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-tools/${f}" + + CT_DoExecLog CFG \ + "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}/configure" \ + --build=${CT_BUILD} \ + --host=${CT_HOST} \ + --target=${CT_TARGET} \ + --program-prefix=${CT_TARGET}- \ + --prefix="${CT_PREFIX_DIR}" + + CT_DoExecLog ALL ${make} ${JOBSFLAGS} + + CT_DoExecLog ALL ${make} install + + CT_Popd + done +} + do_libc() { do_check_mingw_vendor_tuple @@ -109,6 +134,11 @@ do_libc() { CT_DoLog EXTRA "Installing mingw-w64-crt" CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} + if [[ ${CT_MINGW_TOOLS} == "y" ]]; then + CT_DoLog EXTRA "Installing mingw-w64 companion tools" + do_mingw_tools + fi + CT_EndStep if [ "${CT_THREADS}" = "posix" ]; then |