diff --git a/buildenv.mk b/buildenv.mk index a337f982ab..560e000ce0 100644 --- a/buildenv.mk +++ b/buildenv.mk @@ -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 diff --git a/psw/ae/aesm_service/Makefile b/psw/ae/aesm_service/Makefile index 74ac5f3a86..3dccf7c611 100644 --- a/psw/ae/aesm_service/Makefile +++ b/psw/ae/aesm_service/Makefile @@ -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_ diff --git a/psw/uae_service/linux/Makefile b/psw/uae_service/linux/Makefile index 9d7e1af99e..24e4eab6ad 100644 --- a/psw/uae_service/linux/Makefile +++ b/psw/uae_service/linux/Makefile @@ -69,6 +69,8 @@ ifeq ($(ARCH), x86) else PROTPBUF_CXXFLAGS += -m64 endif +PROTPBUF_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 + EXTERNAL_LIB += -lprotobuf