From dccaa6f5f415284fa16ec23722af2024195f9e4d Mon Sep 17 00:00:00 2001 From: Kirill Kirilenko Date: Wed, 18 Nov 2020 19:53:15 +0300 Subject: [PATCH] Do not use libc++ Use C++11 ABI on Linux --- CMakeModules/Gn.cmake | 2 +- CMakeModules/TargetOsAndCpu.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeModules/Gn.cmake b/CMakeModules/Gn.cmake index 4b5edf1..b690479 100644 --- a/CMakeModules/Gn.cmake +++ b/CMakeModules/Gn.cmake @@ -1,4 +1,4 @@ -set(_GEN_ARGS use_gold=false target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\" is_component_build=false) +set(_GEN_ARGS use_gold=false target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\" is_component_build=false use_custom_libcxx=false use_custom_libcxx_for_host=false rtc_use_protobuf=false) if (MSVC OR XCODE) set(_GEN_ARGS ${_GEN_ARGS} is_debug=$<$:true>$<$:false>$<$:false>$<$:false>) diff --git a/CMakeModules/TargetOsAndCpu.cmake b/CMakeModules/TargetOsAndCpu.cmake index 70b9fa4..0c8f9b1 100644 --- a/CMakeModules/TargetOsAndCpu.cmake +++ b/CMakeModules/TargetOsAndCpu.cmake @@ -82,7 +82,7 @@ if (UNIX) if (CMAKE_BUILD_TYPE MATCHES Debug) list(APPEND LIBWEBRTC_DEFINITIONS _GLIBCXX_DEBUG=1 _DEBUG=1) endif (CMAKE_BUILD_TYPE MATCHES Debug) - list(APPEND LIBWEBRTC_DEFINITIONS WEBRTC_POSIX _GLIBCXX_USE_CXX11_ABI=0) + list(APPEND LIBWEBRTC_DEFINITIONS WEBRTC_POSIX) elseif (WIN32) set(LIBWEBRTC_REQUIRED_C_FLAGS_DEBUG "/MDd") set(LIBWEBRTC_REQUIRED_C_FLAGS_RELEASE "/MD")