diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-03-17 14:06:13 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-03-17 14:09:59 +0100 |
| commit | fd26f49958a147b00cfa51e054257587ea4d5a28 (patch) | |
| tree | 52b1880dc87a13fc9b52eff7825dd34981d414ce | |
| parent | 8bfc7f1caa33593aba8ac0f9450be3ead04f907b (diff) | |
| download | VeraCrypt-fd26f49958a147b00cfa51e054257587ea4d5a28.tar.gz VeraCrypt-fd26f49958a147b00cfa51e054257587ea4d5a28.zip | |
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.
| -rw-r--r-- | src/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
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 |