Skip to content

Commit 4176ece

Browse files
committed
Disable GCC UTF-8 manifest via configure switch
The UTF-8 manifest was added in GCC 13 but the configure switch was not added until GCC 14 (https://gcc.gnu.org/PR111170). Better to use the swtich rather than the original hack. Thanks to Peter0x44 for pointing this out (#58).
1 parent 21177fb commit 4176ece

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/variant-x86.patch

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

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

8-
@@ -93,2 +93,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
8+
@@ -90,2 +90,3 @@
99
--with-default-msvcrt=msvcrt-os \
1010
+ --with-default-win32-winnt=0x0501 \
1111
&& make -j$(nproc) \
12-
@@ -99,2 +100,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 \
12+
@@ -102,2 +103,3 @@
1913
--with-sysroot=/bootstrap \
2014
+ --with-arch=pentium4 \
2115
--target=$ARCH \
22-
@@ -132,4 +137,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
16+
@@ -138,4 +140,4 @@
2317
--disable-dependency-tracking \
2418
- --disable-lib32 \
2519
- --enable-lib64 \
2620
+ --enable-lib32 \
2721
+ --disable-lib64 \
2822
CFLAGS="-Os" \
29-
@@ -217,2 +222,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
23+
@@ -223,2 +225,3 @@
3024
--with-default-msvcrt=msvcrt-os \
3125
+ --with-default-win32-winnt=0x0501 \
3226
&& make -j$(nproc) \
33-
@@ -227,4 +233,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
27+
@@ -233,4 +236,4 @@
3428
--disable-dependency-tracking \
3529
- --disable-lib32 \
3630
- --enable-lib64 \
3731
+ --enable-lib32 \
3832
+ --disable-lib64 \
3933
CFLAGS="-Os" \
40-
@@ -251,2 +257,3 @@ RUN /gcc-$GCC_VERSION/configure \
34+
@@ -257,2 +260,3 @@
4135
--with-native-system-header-dir=/include \
4236
+ --with-arch=pentium4 \
4337
--target=$ARCH \
38+
@@ -277,2 +281,3 @@
39+
--disable-win32-registry \
40+
+ --disable-win32-utf8-manifest \
41+
--enable-mingw-wildcard \

0 commit comments

Comments
 (0)