ClangArgs: Set stdlib for apple targets in a single place
This commit is contained in:
committed by
TeamCityServer
parent
f339e9cc66
commit
51d3d1f1a8
+3
-16
@@ -64,6 +64,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
|
|||||||
else -> configurables.arch
|
else -> configurables.arch
|
||||||
}
|
}
|
||||||
add(listOf("-arch", arch))
|
add(listOf("-arch", arch))
|
||||||
|
add(listOf("-stdlib=libc++"))
|
||||||
}
|
}
|
||||||
val hasCustomSysroot = configurables is ZephyrConfigurables
|
val hasCustomSysroot = configurables is ZephyrConfigurables
|
||||||
|| configurables is WasmConfigurables
|
|| configurables is WasmConfigurables
|
||||||
@@ -112,44 +113,30 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
|
|||||||
"-mmacosx-version-min=10.16"
|
"-mmacosx-version-min=10.16"
|
||||||
)
|
)
|
||||||
|
|
||||||
KonanTarget.IOS_ARM32 -> listOf(
|
KonanTarget.IOS_ARM32,
|
||||||
"-stdlib=libc++",
|
|
||||||
"-miphoneos-version-min=$osVersionMin"
|
|
||||||
)
|
|
||||||
|
|
||||||
KonanTarget.IOS_ARM64 -> listOf(
|
KonanTarget.IOS_ARM64 -> listOf(
|
||||||
"-stdlib=libc++",
|
|
||||||
"-miphoneos-version-min=$osVersionMin"
|
"-miphoneos-version-min=$osVersionMin"
|
||||||
)
|
)
|
||||||
|
|
||||||
KonanTarget.IOS_X64 -> listOf(
|
KonanTarget.IOS_X64 -> listOf(
|
||||||
"-stdlib=libc++",
|
|
||||||
"-miphoneos-version-min=$osVersionMin"
|
"-miphoneos-version-min=$osVersionMin"
|
||||||
)
|
)
|
||||||
|
|
||||||
KonanTarget.TVOS_ARM64 -> listOf(
|
KonanTarget.TVOS_ARM64 -> listOf(
|
||||||
"-stdlib=libc++",
|
|
||||||
"-mtvos-version-min=$osVersionMin"
|
"-mtvos-version-min=$osVersionMin"
|
||||||
)
|
)
|
||||||
|
|
||||||
KonanTarget.TVOS_X64 -> listOf(
|
KonanTarget.TVOS_X64 -> listOf(
|
||||||
"-stdlib=libc++",
|
|
||||||
"-mtvos-simulator-version-min=$osVersionMin"
|
"-mtvos-simulator-version-min=$osVersionMin"
|
||||||
)
|
)
|
||||||
|
|
||||||
KonanTarget.WATCHOS_ARM64,
|
KonanTarget.WATCHOS_ARM64,
|
||||||
KonanTarget.WATCHOS_ARM32 -> listOf(
|
KonanTarget.WATCHOS_ARM32 -> listOf(
|
||||||
"-stdlib=libc++",
|
|
||||||
"-mwatchos-version-min=$osVersionMin"
|
"-mwatchos-version-min=$osVersionMin"
|
||||||
)
|
)
|
||||||
|
|
||||||
KonanTarget.WATCHOS_X86 -> listOf(
|
KonanTarget.WATCHOS_X86,
|
||||||
"-stdlib=libc++",
|
|
||||||
"-mwatchos-simulator-version-min=$osVersionMin"
|
|
||||||
)
|
|
||||||
|
|
||||||
KonanTarget.WATCHOS_X64 -> listOf(
|
KonanTarget.WATCHOS_X64 -> listOf(
|
||||||
"-stdlib=libc++",
|
|
||||||
"-mwatchos-simulator-version-min=$osVersionMin"
|
"-mwatchos-simulator-version-min=$osVersionMin"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user