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

use x86_64-w64-mingw32- prefix for tools like dlltool as necessary

Browse Source 
This fixes architecture mismatches when cross-compiling.
This commit is contained in:
Joel Dice 2014-04-01 15:47:23 -06:00
parent f10aa1c5a9
commit 548cce5af0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makefile
View File

@ -726,6 +726,8 @@ endif
openjdk-extra-cflags += $(classpath-extra-cflags) openjdk-extra-cflags += $(classpath-extra-cflags)
find-tool = $(shell if ( command -v "$(1)$(2)" >/dev/null ); then (echo "$(1)$(2)") else (echo "$(2)"); fi)
ifeq ($(platform),windows) ifeq ($(platform),windows)
target-format = pe target-format = pe
@ -776,10 +778,10 @@ ifeq ($(platform),windows)
endif endif
cxx = x86_64-w64-mingw32-g++ $(mflag) cxx = x86_64-w64-mingw32-g++ $(mflag)
cc = x86_64-w64-mingw32-gcc $(mflag) cc = x86_64-w64-mingw32-gcc $(mflag)
dlltool = dlltool dlltool = $(call find-tool,x86_64-w64-mingw32-,dlltool)
ar = ar ar = $(call find-tool,x86_64-w64-mingw32-,ar)
ranlib = ranlib ranlib = $(call find-tool,x86_64-w64-mingw32-,ranlib)
strip = strip strip = $(call find-tool,x86_64-w64-mingw32-,strip)
inc = "$(win64)/include" inc = "$(win64)/include"
lib = "$(win64)/lib" lib = "$(win64)/lib"
else else