mirror of
https://github.com/corda/corda.git
synced 2025-01-01 02:36:44 +00:00
statically link libstdc++ to type-generator on windows
This commit is contained in:
parent
2f94c5b03d
commit
732669dc01
6
makefile
6
makefile
@ -754,6 +754,10 @@ 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 ($(build-platform),windows)
|
||||
static-on-windows = -static
|
||||
endif
|
||||
|
||||
ifeq ($(platform),windows)
|
||||
target-format = pe
|
||||
|
||||
@ -1987,7 +1991,7 @@ endif
|
||||
|
||||
$(generator): $(generator-objects) $(generator-lzma-objects)
|
||||
@echo "linking $(@)"
|
||||
$(build-ld-cpp) $(^) $(build-lflags) -o $(@)
|
||||
$(build-ld-cpp) $(^) $(build-lflags) $(static-on-windows) -o $(@)
|
||||
|
||||
$(openjdk-objects): $(build)/openjdk/%-openjdk.o: $(openjdk-src)/%.c \
|
||||
$(openjdk-headers-dep)
|
||||
|
Loading…
Reference in New Issue
Block a user