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