From fd26f49958a147b00cfa51e054257587ea4d5a28 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Thu, 17 Mar 2016 14:06:13 +0100 Subject: Linux: fix mount failure with "Invalid characters encountered" error when building using gcc-5 by disabling the new C++ ABI. For this to work, wxWidgets static library must be built and used by VeraCrypt by specifying WXSTATIC=1 in make command line. --- src/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index ce6c396f..23d0c516 100644 --- a/src/Makefile +++ b/src/Makefile @@ -175,6 +175,12 @@ ifeq "$(shell uname -s)" "Linux" ifneq "$(origin WXSTATIC)" "command line" LFLAGS += -ldl + else + GCC5USED := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 5) + ifeq "$(GCC5USED)" "1" + CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 + WXCONFIG_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 + endif endif endif -- cgit v1.2.3