1
0
mirror of https://github.com/skeeto/w64devkit.git synced 2025-12-23 22:22:04 +03:00

GCC 13: Disable UTF-8 manifest for i686 (#58)

The manifest is incompatible with Windows XP and prevents GCC's
executables from starting on that platform.
This commit is contained in:
Christopher Wellons
2023-05-02 13:24:56 -04:00
parent 0d6664471a
commit 0423b551db

View File

@@ -1,37 +1,43 @@
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,3 +62,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
@@ -65,3 +65,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
-ARG ARCH=x86_64-w64-mingw32
+ARG ARCH=i686-w64-mingw32
@@ -87,2 +87,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
@@ -92,2 +92,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
--host=$ARCH \
+ --with-default-win32-winnt=0x0501 \
&& make -j$(nproc) \
@@ -100,2 +101,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
@@ -98,2 +99,5 @@ RUN ln -s $ARCH mingw
+# Disable UTF-8 manifest for Windows XP (#58)
+RUN echo >/gcc-$GCC_VERSION/gcc/config/i386/winnt-utf8.manifest
+
WORKDIR /x-gcc
@@ -103,2 +107,3 @@ RUN /gcc-$GCC_VERSION/configure \
--target=$ARCH \
+ --with-arch=pentium4 \
--enable-static \
@@ -127,4 +129,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
@@ -130,4 +135,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
--disable-dependency-tracking \
- --disable-lib32 \
- --enable-lib64 \
+ --enable-lib32 \
+ --disable-lib64 \
CFLAGS="-Os" \
@@ -211,2 +213,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
@@ -214,2 +219,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
--host=$ARCH \
+ --with-default-win32-winnt=0x0501 \
&& make -j$(nproc) \
@@ -220,4 +223,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
@@ -223,4 +229,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
--disable-dependency-tracking \
- --disable-lib32 \
- --enable-lib64 \
+ --enable-lib32 \
+ --disable-lib64 \
CFLAGS="-Os" \
@@ -246,2 +249,3 @@ RUN /gcc-$GCC_VERSION/configure \
@@ -249,2 +255,3 @@ RUN /gcc-$GCC_VERSION/configure \
--host=$ARCH \
+ --with-arch=pentium4 \
--enable-static \