From 47d72aec07e0ecb75dd31556e1cc491fbe4ad8c7 Mon Sep 17 00:00:00 2001
From: Lily Vulcano <millenomi@me.com>
Date: Wed, 17 Jul 2019 12:30:43 -0700
Subject: [PATCH] Revert "build: don't link C++ runtime on android"

---
 CMakeLists.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fac58d57c..203a3a51c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,10 +109,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Windows)
   set(WORKAROUND_SR9138 -Xlinker;-ignore:4049;-Xlinker;-ignore:4217)
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL Android)
-  set(WORKAROUND_PR26110 -Xclang-linker -nostdlib++)
-endif()
-
 # NOTE(compnerd) this is a horrible hack to work around the fact that we do not
 # have a proper library target for Foundation which can link against the
 # CoreFoundation target.  When we gain proper CMake support for Swift, we should
@@ -288,7 +284,6 @@ add_swift_library(Foundation
                     $<$<PLATFORM_ID:Windows>:-lShell32>
                     $<$<PLATFORM_ID:Windows>:-lpathcch>
                     $<$<PLATFORM_ID:Windows>:$<TARGET_OBJECTS:CoreFoundationResources>>
-                    ${WORKAROUND_PR26110}
                   SWIFT_FLAGS
                     -Xcc -F${CMAKE_CURRENT_BINARY_DIR}
                     -DDEPLOYMENT_RUNTIME_SWIFT
@@ -353,7 +348,6 @@ add_swift_library(FoundationNetworking
                     ${Foundation_RPATH}
                     ${WORKAROUND_SR9138}
                     ${WORKAROUND_SR9995}
-                    ${WORKAROUND_PR26110}
                   SWIFT_FLAGS
                     -DDEPLOYMENT_RUNTIME_SWIFT
                     -DNS_BUILDING_FOUNDATION_NETWORKING