From bbafb49b3a151b6434bf825c1240df41b7ee85ff Mon Sep 17 00:00:00 2001
From: aeubanks <ayueubanks@gmail.com>
Date: Thu, 30 Apr 2020 13:24:58 -0700
Subject: [PATCH] Don't force libc++ with clang (#1984)

Clang works with libstdc++.
---
 extern/CMakeProject-cppformat.cmake | 3 ---
 extern/CMakeProject-json.cmake      | 3 ---
 src/CMakeData-gtk.cmake             | 4 ----
 src/CMakeLists.txt                  | 6 ------
 4 files changed, 16 deletions(-)

diff --git a/extern/CMakeProject-cppformat.cmake b/extern/CMakeProject-cppformat.cmake
index 37309e099e..dc63134864 100644
--- a/extern/CMakeProject-cppformat.cmake
+++ b/extern/CMakeProject-cppformat.cmake
@@ -32,7 +32,4 @@ elseif(APPLE)
   sm_add_compile_flag("cppformat" "-stdlib=libc++")
 else() # Unix
   sm_add_compile_flag("cppformat" "-std=${SM_CPP_STANDARD}")
-  if(CMAKE_CXX_COMPILER MATCHES "clang")
-    sm_add_compile_flag("cppformat" "-stdlib=libc++")
-  endif()
 endif()
diff --git a/extern/CMakeProject-json.cmake b/extern/CMakeProject-json.cmake
index ed149904fb..ec133ea2be 100644
--- a/extern/CMakeProject-json.cmake
+++ b/extern/CMakeProject-json.cmake
@@ -40,8 +40,5 @@ else()
     sm_add_compile_flag("jsoncpp" "-stdlib=libc++")
   else() # Unix/Linux
     sm_add_compile_flag("jsoncpp" "-std=gnu++11")
-    if(CMAKE_CXX_COMPILER MATCHES "clang")
-      sm_add_compile_flag("jsoncpp" "-stdlib=libc++")
-    endif()
   endif()
 endif()
diff --git a/src/CMakeData-gtk.cmake b/src/CMakeData-gtk.cmake
index 87946873de..10f9ea6b83 100644
--- a/src/CMakeData-gtk.cmake
+++ b/src/CMakeData-gtk.cmake
@@ -8,10 +8,6 @@ add_library("GtkModule"
             "arch/LoadingWindow/LoadingWindow_GtkModule.h")
 
 sm_add_compile_flag("GtkModule" "-std=${SM_CPP_STANDARD}")
-if(CMAKE_CXX_COMPILER MATCHES "clang")
-  sm_add_compile_flag("GtkModule" "-stdlib=libc++")
-  set_target_properties("GtkModule" PROPERTIES LINK_FLAGS "-stdlib=libc++")
-endif()
 
 # It is normally not appropriate to set the prefix to the empty string. This is
 # to maintain compatibility with the current source. At some point, it may be
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aadde32fd7..f772ae3123 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -390,12 +390,6 @@ else() # Linux
   endif()
 
   sm_add_compile_flag("${SM_EXE_NAME}" "-std=${SM_CPP_STANDARD}")
-  if(CMAKE_CXX_COMPILER MATCHES "clang")
-    sm_add_compile_flag("${SM_EXE_NAME}" "-stdlib=libc++")
-    set_target_properties("${SM_EXE_NAME}"
-                          PROPERTIES LINK_FLAGS "-stdlib=libc++")
-    sm_add_compile_flag("jsoncpp" "-stdlib=libc++")
-  endif()
 endif()
 
 set_property(TARGET "${SM_EXE_NAME}" PROPERTY FOLDER "Internal Libraries")