From db9ff9a4cee3b3faedbc9fe46a528f98d609e34e Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Mon, 9 Aug 2021 21:33:11 +0700 Subject: [PATCH] [K/N] Remove obsolete hack Besides obsolescence, this hack is not working for "user" LLVM variant. --- .../kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt | 7 +------ 1 file changed, 1 insertion(+), 6 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 8c716215a3f..ff83d405495 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 @@ -183,12 +183,7 @@ sealed class ClangArgs( */ val clangXXArgs: Array = clangArgs + when (configurables) { is AppleConfigurables -> arrayOf( - "-stdlib=libc++", - // Starting from Xcode 12.5, platform SDKs contain C++ stdlib. - // It results in two c++ stdlib in search path (one from LLVM, another from SDK). - // We workaround this problem by explicitly specifying path to stdlib. - // TODO: Revise after LLVM update. - "-nostdinc++", "-isystem", "$absoluteLlvmHome/include/c++/v1" + "-stdlib=libc++" ) else -> emptyArray() }