From cb0bcfae6ba54dcfa7c2bdf18d7321006a3f0d5d Mon Sep 17 00:00:00 2001 From: Rafael Kitover <rkitover@gmail.com> Date: Mon, 30 Jan 2017 19:12:04 -0800 Subject: [PATCH] fix msys2 build failure in 34e408cc cmake automatically passes -std=gnu++11 in some cases, while we were passing -std=c++11, and this was causing incompatibilites in name mangling between different objects. Fix this by using -std=gnu++11 for gcc. --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55ab122a..9d51eaf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,9 +312,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ENDIF() ENDIF() - # clang doesn't like -std=c++11 for non-C++ sources IF(CMAKE_COMPILER_IS_GNUCXX) - SET(MY_C_FLAGS ${MY_C_FLAGS} -std=c++11) + SET(MY_C_FLAGS ${MY_C_FLAGS} -std=gnu++11) ENDIF() IF(MINGW)