ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 02:09:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fall back to x86_64-w64-mingw32 compiler for 32-bit Windows builds if i686-w64-mingw32 compiler not found

Browse Source 
A multilib-capable x86_64-w64-mingw32 compiler should work just fine,
but since we don't know if it's mutilib or not, we try the
i686-w64-mingw32 version first.
This commit is contained in:
Joel Dice 2012-07-06 11:21:53 -06:00
parent 86be0c409c
commit 8706b6ad4a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefile
View File

@ -407,12 +407,14 @@ ifeq ($(platform),windows)
ifeq (,$(filter mingw32 cygwin,$(build-platform))) ifeq (,$(filter mingw32 cygwin,$(build-platform)))
openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
cxx = i686-w64-mingw32-g++ -m32 prefix := $(shell i686-w64-mingw32-gcc --version >/dev/null 2>&1 \
cc = i686-w64-mingw32-gcc -m32 && echo i686-w64-mingw32- || echo x86_64-w64-mingw32-)
dlltool = i686-w64-mingw32-dlltool -mi386 --as-flags=--32 cxx = $(prefix)g++ -m32
ar = i686-w64-mingw32-ar cc = $(prefix)gcc -m32
ranlib = i686-w64-mingw32-ranlib dlltool = $(prefix)dlltool -mi386 --as-flags=--32
strip = i686-w64-mingw32-strip --strip-all ar = $(prefix)ar
ranlib = $(prefix)ranlib
strip = $(prefix)strip --strip-all
else else
build-system = windows build-system = windows
common-cflags += "-I$(JAVA_HOME)/include/win32" common-cflags += "-I$(JAVA_HOME)/include/win32"