Skip to content
Open

UCRT #382

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ RUN printf '#include <crtdefs.h>\n#if __has_include_next(<stddef.h>)\n#include_n
&& /dl/mingw/mingw-w64-headers/configure \
--prefix=/bootstrap \
--host=$ARCH \
--with-default-msvcrt=msvcrt-os \
--with-default-msvcrt=ucrt \
&& make -j$(nproc) \
&& make install

Expand Down Expand Up @@ -309,7 +309,7 @@ RUN /dl/mingw/mingw-w64-crt/configure \
--prefix=/bootstrap \
--with-sysroot=/bootstrap \
--host=$ARCH \
--with-default-msvcrt=msvcrt-os \
--with-default-msvcrt=ucrt \
--disable-dependency-tracking \
--disable-lib32 \
--enable-lib64 \
Expand Down Expand Up @@ -404,7 +404,7 @@ RUN /dl/mingw/mingw-w64-headers/configure \
--prefix=$PREFIX \
--host=$ARCH \
--enable-idl \
--with-default-msvcrt=msvcrt-os \
--with-default-msvcrt=ucrt \
&& make -j$(nproc) \
&& make install

Expand All @@ -413,7 +413,7 @@ RUN /dl/mingw/mingw-w64-crt/configure \
--prefix=$PREFIX \
--with-sysroot=$PREFIX \
--host=$ARCH \
--with-default-msvcrt=msvcrt-os \
--with-default-msvcrt=ucrt \
--disable-dependency-tracking \
--disable-lib32 \
--enable-lib64 \
Expand Down
7 changes: 0 additions & 7 deletions src/variant-x86.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
-ARG ARCH=x86_64-w64-mingw32
+ARG ARCH=i686-w64-mingw32
ENV ARCH=$ARCH
@@ -260,2 +260,3 @@
--with-default-msvcrt=msvcrt-os \
+ --with-default-win32-winnt=0x0501 \
&& make -j$(nproc) \
@@ -272,2 +273,3 @@
--with-sysroot=/bootstrap \
Expand All @@ -20,10 +17,6 @@
+ --enable-lib32 \
+ --disable-lib64 \
CFLAGS="-O2" \
@@ -399,2 +401,3 @@
--with-default-msvcrt=msvcrt-os \
+ --with-default-win32-winnt=0x0501 \
&& make -j$(nproc) \
@@ -409,4 +412,4 @@
--disable-dependency-tracking \
- --disable-lib32 \
Expand Down
Loading