mirror of
https://github.com/corda/corda.git
synced 2025-01-06 05:04:20 +00:00
statically link libstdc++ to type-generator on windows (for real, this time!)
This commit is contained in:
parent
4d79f3bea1
commit
051804816a
5
makefile
5
makefile
@ -754,10 +754,6 @@ openjdk-extra-cflags += $(classpath-extra-cflags)
|
|||||||
|
|
||||||
find-tool = $(shell if ( command -v "$(1)$(2)" >/dev/null ); then (echo "$(1)$(2)") else (echo "$(2)"); fi)
|
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)
|
ifeq ($(platform),windows)
|
||||||
target-format = pe
|
target-format = pe
|
||||||
|
|
||||||
@ -787,6 +783,7 @@ ifeq ($(platform),windows)
|
|||||||
strip = $(prefix)strip --strip-all
|
strip = $(prefix)strip --strip-all
|
||||||
else
|
else
|
||||||
build-system = windows
|
build-system = windows
|
||||||
|
static-on-windows = -static
|
||||||
common-cflags += "-I$(JAVA_HOME)/include/win32"
|
common-cflags += "-I$(JAVA_HOME)/include/win32"
|
||||||
build-cflags = $(common-cflags) -I$(src) -I$(inc) -mthreads
|
build-cflags = $(common-cflags) -I$(src) -I$(inc) -mthreads
|
||||||
openjdk-extra-cflags =
|
openjdk-extra-cflags =
|
||||||
|
Loading…
Reference in New Issue
Block a user