ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-25 13:29:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/gcc-6-compat' into executable-heap

Browse Source
This commit is contained in:
exfalso 2017-01-26 12:05:17 +00:00
commit 84841a28d9
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildenv.mk
View File

@ -94,6 +94,9 @@ CXXFLAGS += -Wnon-virtual-dtor
# for static_assert() # for static_assert()
CXXFLAGS += -std=c++0x CXXFLAGS += -std=c++0x
# Disable cxx11 abi
CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
# this turns off the RCS / SCCS implicit rules of GNU Make # this turns off the RCS / SCCS implicit rules of GNU Make
% : RCS/%,v % : RCS/%,v

3
psw/ae/aesm_service/Makefile
View File

@ -82,6 +82,9 @@ INCLUDE += -I$(SGX_IPP_INC) \
EDGER8R := $(LINUX_SDK_DIR)/edger8r/linux/_build/Edger8r.native EDGER8R := $(LINUX_SDK_DIR)/edger8r/linux/_build/Edger8r.native
# Disable cxx11 abi
CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
ifdef PROFILE ifdef PROFILE
CXXFLAGS += -D_PROFILE_ CXXFLAGS += -D_PROFILE_
CFLAGS += -D_PROFILE_ CFLAGS += -D_PROFILE_

2
psw/uae_service/linux/Makefile
View File

@ -69,6 +69,8 @@ ifeq ($(ARCH), x86)
else else
PROTPBUF_CXXFLAGS += -m64 PROTPBUF_CXXFLAGS += -m64
endif endif
PROTPBUF_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
EXTERNAL_LIB += -lprotobuf EXTERNAL_LIB += -lprotobuf