mirror of
https://github.com/corda/corda.git
synced 2025-01-03 19:54:13 +00:00
Merge pull request #276 from mikehearn/mavericks-fix
Fix makefiles for building on Mavericks
This commit is contained in:
commit
68e74d1284
2
makefile
2
makefile
@ -620,7 +620,7 @@ ifeq ($(platform),darwin)
|
|||||||
|
|
||||||
soname-flag =
|
soname-flag =
|
||||||
version-script-flag =
|
version-script-flag =
|
||||||
lflags = $(common-lflags) -ldl -framework CoreFoundation
|
lflags = $(common-lflags) -ldl -framework CoreFoundation -framework Foundation
|
||||||
|
|
||||||
ifeq (,$(shell ld -v 2>&1 | grep cctools))
|
ifeq (,$(shell ld -v 2>&1 | grep cctools))
|
||||||
lflags += -Wl,-compatibility_version,1.0.0
|
lflags += -Wl,-compatibility_version,1.0.0
|
||||||
|
@ -343,7 +343,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
openjdk-cflags += \
|
openjdk-cflags += \
|
||||||
-DMACOSX
|
-DMACOSX -x objective-c
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user