mirror of
https://github.com/corda/corda.git
synced 2025-01-17 02:09:50 +00:00
fix Windows x86_64 build regression due to unspecified AVIAN_TARGET_FORMAT
This commit is contained in:
parent
bad3a7979c
commit
1630739849
6
makefile
6
makefile
@ -640,9 +640,7 @@ endif
|
||||
openjdk-extra-cflags += $(classpath-extra-cflags)
|
||||
|
||||
ifeq ($(platform),windows)
|
||||
ifeq ($(target-format),)
|
||||
target-format = pe
|
||||
endif
|
||||
target-format = pe
|
||||
|
||||
inc = "$(win32)/include"
|
||||
lib = "$(win32)/lib"
|
||||
@ -1006,8 +1004,6 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
build-cflags += -DAVIAN_HOST_TARGET
|
||||
|
||||
c-objects = $(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%.o,$(x)))
|
||||
cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
|
||||
asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.$(asm-format),$(3)/%-asm.o,$(x)))
|
||||
|
Loading…
Reference in New Issue
Block a user