From 51d3d1f1a8d861c626fb15f5722abfe8bc5bef49 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Tue, 23 Mar 2021 18:43:49 +0700
Subject: [PATCH] ClangArgs: Set stdlib for apple targets in a single place

---
 .../kotlin/konan/target/ClangArgs.kt          | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
index b49b8884800..dfc7021b05a 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
@@ -64,6 +64,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
                 else -> configurables.arch
             }
             add(listOf("-arch", arch))
+            add(listOf("-stdlib=libc++"))
         }
         val hasCustomSysroot = configurables is ZephyrConfigurables
                 || configurables is WasmConfigurables
@@ -112,44 +113,30 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
                 "-mmacosx-version-min=10.16"
         )
 
-        KonanTarget.IOS_ARM32 -> listOf(
-                "-stdlib=libc++",
-                "-miphoneos-version-min=$osVersionMin"
-        )
-
+        KonanTarget.IOS_ARM32,
         KonanTarget.IOS_ARM64 -> listOf(
-                "-stdlib=libc++",
                 "-miphoneos-version-min=$osVersionMin"
         )
 
         KonanTarget.IOS_X64 -> listOf(
-                "-stdlib=libc++",
                 "-miphoneos-version-min=$osVersionMin"
         )
 
         KonanTarget.TVOS_ARM64 -> listOf(
-                "-stdlib=libc++",
                 "-mtvos-version-min=$osVersionMin"
         )
 
         KonanTarget.TVOS_X64 -> listOf(
-                "-stdlib=libc++",
                 "-mtvos-simulator-version-min=$osVersionMin"
         )
 
         KonanTarget.WATCHOS_ARM64,
         KonanTarget.WATCHOS_ARM32 -> listOf(
-                "-stdlib=libc++",
                 "-mwatchos-version-min=$osVersionMin"
         )
 
-        KonanTarget.WATCHOS_X86 -> listOf(
-                "-stdlib=libc++",
-                "-mwatchos-simulator-version-min=$osVersionMin"
-        )
-
+        KonanTarget.WATCHOS_X86,
         KonanTarget.WATCHOS_X64 -> listOf(
-                "-stdlib=libc++",
                 "-mwatchos-simulator-version-min=$osVersionMin"
         )