|
| 1 | +diff --git a/Dockerfile b/Dockerfile |
| 2 | +index cbad367..5f0e922 100644 |
1 | 3 | --- a/Dockerfile
|
2 | 4 | +++ b/Dockerfile
|
3 |
| -@@ -65,3 +65,3 @@ COPY src/w64devkit.c src/w64devkit.ico \ |
| 5 | +@@ -74,3 +74,3 @@ COPY src/w64devkit.c src/w64devkit.ico \ |
4 | 6 |
|
5 | 7 | -ARG ARCH=x86_64-w64-mingw32
|
6 | 8 | +ARG ARCH=i686-w64-mingw32
|
7 | 9 |
|
8 |
| -@@ -93,2 +93,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ |
| 10 | +@@ -102,2 +102,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ |
9 | 11 | --with-default-msvcrt=msvcrt-os \
|
10 | 12 | + --with-default-win32-winnt=0x0501 \
|
11 | 13 | && make -j$(nproc) \
|
12 |
| -@@ -99,2 +100,5 @@ RUN ln -s $ARCH mingw |
| 14 | +@@ -108,2 +109,5 @@ RUN ln -s $ARCH mingw |
13 | 15 |
|
14 | 16 | +# Disable UTF-8 manifest for Windows XP (#58)
|
15 | 17 | +RUN echo >/gcc-$GCC_VERSION/gcc/config/i386/winnt-utf8.manifest
|
16 | 18 | +
|
17 | 19 | WORKDIR /x-gcc
|
18 |
| -@@ -104,2 +108,3 @@ RUN /gcc-$GCC_VERSION/configure \ |
| 20 | +@@ -113,2 +117,3 @@ RUN /gcc-$GCC_VERSION/configure \ |
19 | 21 | --target=$ARCH \
|
20 | 22 | + --with-arch=pentium4 \
|
21 | 23 | --enable-static \
|
22 |
| -@@ -132,4 +137,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ |
| 24 | +@@ -141,4 +146,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ |
23 | 25 | --disable-dependency-tracking \
|
24 | 26 | - --disable-lib32 \
|
25 | 27 | - --enable-lib64 \
|
26 | 28 | + --enable-lib32 \
|
27 | 29 | + --disable-lib64 \
|
28 | 30 | CFLAGS="-Os" \
|
29 |
| -@@ -217,2 +222,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ |
| 31 | +@@ -226,2 +231,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ |
30 | 32 | --with-default-msvcrt=msvcrt-os \
|
31 | 33 | + --with-default-win32-winnt=0x0501 \
|
32 | 34 | && make -j$(nproc) \
|
33 |
| -@@ -227,4 +233,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ |
| 35 | +@@ -236,4 +242,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ |
34 | 36 | --disable-dependency-tracking \
|
35 | 37 | - --disable-lib32 \
|
36 | 38 | - --enable-lib64 \
|
37 | 39 | + --enable-lib32 \
|
38 | 40 | + --disable-lib64 \
|
39 | 41 | CFLAGS="-Os" \
|
40 |
| -@@ -239,2 +245,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \ |
| 42 | +@@ -248,2 +254,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \ |
41 | 43 | --host=$ARCH \
|
42 | 44 | + --with-arch=pentium4 \
|
43 | 45 | --enable-static \
|
| 46 | +@@ -512,3 +519,3 @@ RUN cat $PREFIX/src/git-*.patch | patch -p1 \ |
| 47 | + NO_GITWEB=1 \ |
| 48 | +- MSYSTEM=MINGW64 \ |
| 49 | ++ MSYSTEM=MINGW32 \ |
| 50 | + CFLAGS="-Os -I/deps/include/" \ |
0 commit comments