Revert "Fix compiling of 32 bit binary on 64-bit Windows"

This reverts commit 1e8836d921b3

Broken compile on mingw under Windows:

Config:
debug: 'yes'
optimize: 'yes'
arch: 'i386'
bits: '32'
prefetch: 'yes'
bsfq: 'no'
popcnt: 'no'
sse: 'yes'
pext: 'no'

Flags:
CXX: i686-w64-mingw32-c++
CXXFLAGS: -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11  -Wextra -Wshadow -g -O3 -msse
LDFLAGS:  -static

Testing config sanity. If this fails, try 'make help' ...

mingw32-make[1]: Leaving directory 'C:/stockfish/src'
c:/MinGw/bin/mingw32-make ARCH=x86-32 COMP=mingw all
mingw32-make[1]: Entering directory 'C:/stockfish/src'
sh: C:\Program: No such file or directory
i686-w64-mingw32-c++ -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11  -Wextra -Wshadow -g -O3 -msse   -c -o benchmark.o benchmark.cpp
<builtin>: recipe for target 'benchmark.o' failed
process_begin: CreateProcess(NULL, i686-w64-mingw32-c++ -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11 -Wextra -Wshadow -g -O3 -msse -c -o benchmark.o benchmark.cpp, ...) failed.
make (e=2): Impossibile trovare il file specificato.

mingw32-make[1]: *** [benchmark.o] Error 2
mingw32-make[1]: Leaving directory 'C:/stockfish/src'
makefile:401: recipe for target 'build' failed
mingw32-make: *** [build] Error 2

No functional change.

diff --git a/src/Makefile b/src/Makefile
index ee09dc7b63fdb7f19b43fd621b79ee06e4930c00..4e4d3d918539f73d0df51e41b77dde2b1188bfc1 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -160,18 +160,22 @@ endif
 ifeq ($(COMP),mingw)
        comp=mingw
 
 ifeq ($(COMP),mingw)
        comp=mingw
 

-       ifeq ($(bits),64)
-               ifeq ($(shell which x86_64-w64-mingw32-c++-posix),)
-                       CXX=x86_64-w64-mingw32-c++
+       ifeq ($(UNAME),Linux)
+               ifeq ($(bits),64)
+                       ifeq ($(shell which x86_64-w64-mingw32-c++-posix),)
+                               CXX=x86_64-w64-mingw32-c++
+                       else
+                               CXX=x86_64-w64-mingw32-c++-posix
+                       endif

                else
                else

-                       CXX=x86_64-w64-mingw32-c++-posix
+                       ifeq ($(shell which i686-w64-mingw32-c++-posix),)
+                               CXX=i686-w64-mingw32-c++
+                       else
+                               CXX=i686-w64-mingw32-c++-posix
+                       endif

                endif
        else
                endif
        else

-               ifeq ($(shell which i686-w64-mingw32-c++-posix),)
-                       CXX=i686-w64-mingw32-c++
-               else
-                       CXX=i686-w64-mingw32-c++-posix
-               endif
+               CXX=g++

        endif
 
        CXXFLAGS += -Wextra -Wshadow
        endif
 
        CXXFLAGS += -Wextra -Wshadow