mirror of
https://github.com/corda/corda.git
synced 2025-01-16 01:40:17 +00:00
GCC 6 compat
Signed-off-by: Andras Slemmer <andras.slemmer@r3cev.com>
This commit is contained in:
parent
d89c9abfd2
commit
f58cb39e3e
@ -94,6 +94,9 @@ CXXFLAGS += -Wnon-virtual-dtor
|
||||
# for static_assert()
|
||||
CXXFLAGS += -std=c++0x
|
||||
|
||||
# Disable cxx11 abi
|
||||
CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
|
||||
|
||||
.DEFAULT_GOAL := all
|
||||
# this turns off the RCS / SCCS implicit rules of GNU Make
|
||||
% : RCS/%,v
|
||||
|
@ -82,6 +82,9 @@ INCLUDE += -I$(SGX_IPP_INC) \
|
||||
|
||||
EDGER8R := $(LINUX_SDK_DIR)/edger8r/linux/_build/Edger8r.native
|
||||
|
||||
# Disable cxx11 abi
|
||||
CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
|
||||
|
||||
ifdef PROFILE
|
||||
CXXFLAGS += -D_PROFILE_
|
||||
CFLAGS += -D_PROFILE_
|
||||
|
@ -69,6 +69,8 @@ ifeq ($(ARCH), x86)
|
||||
else
|
||||
PROTPBUF_CXXFLAGS += -m64
|
||||
endif
|
||||
PROTPBUF_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
|
||||
|
||||
|
||||
EXTERNAL_LIB += -lprotobuf
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user