Skip to content

Commit 0423b55

Browse files
committed
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.
1 parent 0d66644 commit 0423b55

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

src/variant-i686.patch

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
11
--- a/Dockerfile
22
+++ b/Dockerfile
3-
@@ -62,3 +62,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
3+
@@ -65,3 +65,3 @@ COPY src/w64devkit.c src/w64devkit.ico \
44

55
-ARG ARCH=x86_64-w64-mingw32
66
+ARG ARCH=i686-w64-mingw32
77

8-
@@ -87,2 +87,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
8+
@@ -92,2 +92,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
99
--host=$ARCH \
1010
+ --with-default-win32-winnt=0x0501 \
1111
&& make -j$(nproc) \
12-
@@ -100,2 +101,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
12+
@@ -98,2 +99,5 @@ RUN ln -s $ARCH mingw
13+
14+
+# Disable UTF-8 manifest for Windows XP (#58)
15+
+RUN echo >/gcc-$GCC_VERSION/gcc/config/i386/winnt-utf8.manifest
16+
+
17+
WORKDIR /x-gcc
18+
@@ -103,2 +107,3 @@ RUN /gcc-$GCC_VERSION/configure \
1319
--target=$ARCH \
1420
+ --with-arch=pentium4 \
1521
--enable-static \
16-
@@ -127,4 +129,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
22+
@@ -130,4 +135,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
1723
--disable-dependency-tracking \
1824
- --disable-lib32 \
1925
- --enable-lib64 \
2026
+ --enable-lib32 \
2127
+ --disable-lib64 \
2228
CFLAGS="-Os" \
23-
@@ -211,2 +213,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
29+
@@ -214,2 +219,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
2430
--host=$ARCH \
2531
+ --with-default-win32-winnt=0x0501 \
2632
&& make -j$(nproc) \
27-
@@ -220,4 +223,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
33+
@@ -223,4 +229,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
2834
--disable-dependency-tracking \
2935
- --disable-lib32 \
3036
- --enable-lib64 \
3137
+ --enable-lib32 \
3238
+ --disable-lib64 \
3339
CFLAGS="-Os" \
34-
@@ -246,2 +249,3 @@ RUN /gcc-$GCC_VERSION/configure \
40+
@@ -249,2 +255,3 @@ RUN /gcc-$GCC_VERSION/configure \
3541
--host=$ARCH \
3642
+ --with-arch=pentium4 \
3743
--enable-static \

0 commit comments

Comments
 (0)