mirror of
https://github.com/corda/corda.git
synced 2025-01-05 20:54:13 +00:00
Merge pull request #214 from dicej/prefix
use x86_64-w64-mingw32- prefix for tools like dlltool
This commit is contained in:
commit
2b5c57627c
10
makefile
10
makefile
@ -726,6 +726,8 @@ endif
|
||||
|
||||
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)
|
||||
target-format = pe
|
||||
|
||||
@ -776,10 +778,10 @@ ifeq ($(platform),windows)
|
||||
endif
|
||||
cxx = x86_64-w64-mingw32-g++ $(mflag)
|
||||
cc = x86_64-w64-mingw32-gcc $(mflag)
|
||||
dlltool = dlltool
|
||||
ar = ar
|
||||
ranlib = ranlib
|
||||
strip = strip
|
||||
dlltool = $(call find-tool,x86_64-w64-mingw32-,dlltool)
|
||||
ar = $(call find-tool,x86_64-w64-mingw32-,ar)
|
||||
ranlib = $(call find-tool,x86_64-w64-mingw32-,ranlib)
|
||||
strip = $(call find-tool,x86_64-w64-mingw32-,strip)
|
||||
inc = "$(win64)/include"
|
||||
lib = "$(win64)/lib"
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user