mirror of
https://github.com/corda/corda.git
synced 2025-01-06 05:04:20 +00:00
support cross builds on OS X to non-Mac targets
This commit is contained in:
parent
4c47f4fae8
commit
9522842b4b
15
makefile
15
makefile
@ -229,7 +229,7 @@ endif
|
|||||||
ifeq ($(arch),arm)
|
ifeq ($(arch),arm)
|
||||||
asm = arm
|
asm = arm
|
||||||
pointer-size = 4
|
pointer-size = 4
|
||||||
ifneq ($(platform),darwin)
|
ifneq ($(build-platform),darwin)
|
||||||
cflags += -marm -Wno-psabi
|
cflags += -marm -Wno-psabi
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -251,6 +251,12 @@ ifeq ($(arch),arm)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(build-platform),darwin)
|
||||||
|
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
|
||||||
|
cflags += -I/System/Library/Frameworks/JavaVM.framework/Headers/
|
||||||
|
build-lflags += -framework CoreFoundation
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(platform),darwin)
|
ifeq ($(platform),darwin)
|
||||||
ifeq (${OSX_SDK_SYSROOT},)
|
ifeq (${OSX_SDK_SYSROOT},)
|
||||||
OSX_SDK_SYSROOT = 10.4u
|
OSX_SDK_SYSROOT = 10.4u
|
||||||
@ -267,10 +273,6 @@ ifeq ($(platform),darwin)
|
|||||||
sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
|
sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
|
||||||
cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
|
cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
|
||||||
$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
|
$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
|
||||||
else
|
|
||||||
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
|
|
||||||
cflags += -I/System/Library/Frameworks/JavaVM.framework/Headers/
|
|
||||||
build-lflags += -framework CoreFoundation
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
version-script-flag =
|
version-script-flag =
|
||||||
@ -555,6 +557,9 @@ else
|
|||||||
-DAVIAN_CLASSPATH=\"[classpathJar]\"
|
-DAVIAN_CLASSPATH=\"[classpathJar]\"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
cflags += $(extra-cflags)
|
||||||
|
lflags += $(extra-lflags)
|
||||||
|
|
||||||
driver-source = $(src)/main.cpp
|
driver-source = $(src)/main.cpp
|
||||||
driver-object = $(build)/main.o
|
driver-object = $(build)/main.o
|
||||||
driver-dynamic-objects = \
|
driver-dynamic-objects = \
|
||||||
|
Loading…
Reference in New Issue
Block a user