mirror of
https://github.com/corda/corda.git
synced 2025-01-07 13:38:47 +00:00
Fixes build parameters for Mac
This commit is contained in:
parent
1c9667104e
commit
782f7e8feb
17
makefile
17
makefile
@ -33,6 +33,9 @@ test = test
|
|||||||
build-cxx = g++
|
build-cxx = g++
|
||||||
build-cc = gcc
|
build-cc = gcc
|
||||||
|
|
||||||
|
pthread = -pthread
|
||||||
|
lpthread = -lpthread
|
||||||
|
|
||||||
cxx = $(build-cxx)
|
cxx = $(build-cxx)
|
||||||
cc = $(build-cc)
|
cc = $(build-cc)
|
||||||
ar = ar
|
ar = ar
|
||||||
@ -54,11 +57,6 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
|
|||||||
-I$(JAVA_HOME)/include -idirafter $(src) -I$(bld) -D__STDC_LIMIT_MACROS \
|
-I$(JAVA_HOME)/include -idirafter $(src) -I$(bld) -D__STDC_LIMIT_MACROS \
|
||||||
-DBUILTIN_LIBRARIES=\"natives,tlscontext,scaler\"
|
-DBUILTIN_LIBRARIES=\"natives,tlscontext,scaler\"
|
||||||
|
|
||||||
cflags = $(common-cflags) -fPIC -fvisibility=hidden \
|
|
||||||
-I$(JAVA_HOME)/include/linux -I$(src) -pthread
|
|
||||||
|
|
||||||
lflags = -lpthread -ldl -lm -lz
|
|
||||||
|
|
||||||
system = posix
|
system = posix
|
||||||
asm = x86
|
asm = x86
|
||||||
|
|
||||||
@ -66,6 +64,8 @@ ifeq ($(platform),darwin)
|
|||||||
rdynamic =
|
rdynamic =
|
||||||
thread-cflags =
|
thread-cflags =
|
||||||
shared = -dynamiclib
|
shared = -dynamiclib
|
||||||
|
pthread =
|
||||||
|
lpthread =
|
||||||
endif
|
endif
|
||||||
ifeq ($(platform),windows)
|
ifeq ($(platform),windows)
|
||||||
inc = /usr/local/win32/include
|
inc = /usr/local/win32/include
|
||||||
@ -84,6 +84,11 @@ ifeq ($(platform),windows)
|
|||||||
cflags = $(common-cflags) -I$(inc)
|
cflags = $(common-cflags) -I$(inc)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
cflags = $(common-cflags) -fPIC -fvisibility=hidden \
|
||||||
|
-I$(JAVA_HOME)/include/linux -I$(src) $(pthread)
|
||||||
|
|
||||||
|
lflags = $(lpthread) -ldl -lm -lz
|
||||||
|
|
||||||
ifeq ($(mode),debug)
|
ifeq ($(mode),debug)
|
||||||
cflags += -O0 -g3
|
cflags += -O0 -g3
|
||||||
endif
|
endif
|
||||||
@ -275,7 +280,7 @@ endif
|
|||||||
|
|
||||||
$(executable): $(archive)
|
$(executable): $(archive)
|
||||||
@echo "linking $(@)"
|
@echo "linking $(@)"
|
||||||
$(cc) -Wl,--whole-archive $(^) -Wl,--no-whole-archive \
|
$(cc) -Wl,-all_load $(^) \
|
||||||
$(lflags) $(rdynamic) -o $(@)
|
$(lflags) $(rdynamic) -o $(@)
|
||||||
@$(strip) --strip-all $(@)
|
@$(strip) --strip-all $(@)
|
||||||
@$(show-size) $(@)
|
@$(show-size) $(@)
|
||||||
|
Loading…
Reference in New Issue
Block a user