Merge pull request #321 from nicolasnoble/mips-compilers

Some more tweaks to the toolchains.

Author: nicolasnoble

tools/win32-gdb/Dockerfile

@@ -37,7 +37,7 @@ RUN C:\msys64\usr\bin\bash.exe -l -c 'exit 0'; `
     Get-Process @('bash', 'dirmngr', 'gpg-agent', 'pacman') -ErrorAction SilentlyContinue | Stop-Process -Force -PassThru | Wait-Process; `
     Write-Host 'Eating error.';
 
-RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm mingw-w64-x86_64-toolchain'	
+RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm mingw-w64-x86_64-toolchain'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm automake autoconf make intltool libtool zip unzip'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm bison diffutils texinfo'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm mingw-w64-x86_64-expat mingw-w64-x86_64-ncurses'

tools/win32-mips/Dockerfile

@@ -64,19 +64,18 @@ ENV MSYSTEM MINGW64
 
 RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /c/binutils-2.35.1 && /c/binutils-2.35.1/configure --target=mipsel-none-elf --disable-multilib --disable-nls --disable-werror --prefix=/DIST || (cat /BUILD/config.log && exit 1)'
 
-RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/binutils-2.35.1 all -j12'
+RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/binutils-2.35.1 all'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/binutils-2.35.1 install-strip'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /c/binutils-2.35.1/COPYING* /DIST'
 
 RUN C:\msys64\usr\bin\bash.exe -l -c 'mkdir /c/gcc-10.2.0/build && cd /c/gcc-10.2.0/build && ../configure --target=mipsel-none-elf --without-isl --disable-nls --disable-threads --disable-shared --disable-libssp --disable-libstdcxx-pch --disable-libgomp --disable-werror --without-headers --with-as=/DIST/bin/mipsel-none-elf-as --with-ld=/DIST/bin/mipsel-none-elf-ld --enable-languages=c,c++ --prefix=/DIST || (cat /BUILD/config.log && exit 1)'
-RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-10.2.0/build all-gcc -j12'
-RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-10.2.0/build all-target-libgcc -j12'
+RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-10.2.0/build all-gcc'
+RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-10.2.0/build all-target-libgcc'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /c/gcc-10.2.0/build install-strip-gcc install-strip-target-libgcc'
-COPY ./touch.c C:\
-RUN C:\msys64\usr\bin\bash.exe -l -c 'gcc -O2 /c/touch.c -o /DIST/bin/touch.exe'
-RUN C:\msys64\usr\bin\bash.exe -l -c 'strip /DIST/bin/touch.exe'
+
+RUN C:\msys64\usr\bin\bash.exe -l -c 'for t in cat cp echo mkdir rm touch ; do cp /usr/bin/$t.exe /DIST/bin ; done'
 RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /mingw64/bin/mingw32-make.exe /DIST/bin/make.exe'
-RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && find . -name *.exe | while read bin ; do ldd $bin | cut -f2 -d\> | cut -f2 -d\  | grep mingw64 | while read f ; do cp $f $(dirname $bin) ; done ; done'
+RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && find . -name *.exe | while read bin ; do ldd $bin | cut -f2 -d\> | cut -f2 -d\  | grep -v /c/Windows/S | while read f ; do cp $f $(dirname $bin) ; done ; done'
 
 RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/g++-mipsel-none-elf-10.2.0.zip . -r'