azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ClangArgs] use --sysroot for all targets

Browse Source 
Change `-isysroot` to `--sysroot` because it is the same thing on darwin targets.
This commit is contained in:
Sergey Bogolepov
2020-11-30 17:54:27 +07:00
committed by Stanislav Erokhin
parent c779ce2e6d
commit 23223f7bb0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+8 -8
View File
@@ -108,33 +108,33 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
KonanTarget.IOS_ARM32 -> listOf(
"-stdlib=libc++",
"-arch", "armv7",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-miphoneos-version-min=$osVersionMin"
)
KonanTarget.IOS_ARM64 -> listOf(
"-stdlib=libc++",
"-arch", "arm64",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-miphoneos-version-min=$osVersionMin"
)
KonanTarget.IOS_X64 -> listOf(
"-stdlib=libc++",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-miphoneos-version-min=$osVersionMin"
)
KonanTarget.TVOS_ARM64 -> listOf(
"-stdlib=libc++",
"-arch", "arm64",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-mtvos-version-min=$osVersionMin"
)
KonanTarget.TVOS_X64 -> listOf(
"-stdlib=libc++",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-mtvos-simulator-version-min=$osVersionMin"
)
@@ -142,20 +142,20 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
KonanTarget.WATCHOS_ARM32 -> listOf(
"-stdlib=libc++",
"-arch", "armv7k",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-mwatchos-version-min=$osVersionMin"
)
KonanTarget.WATCHOS_X86 -> listOf(
"-stdlib=libc++",
"-arch", "i386",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-mwatchos-simulator-version-min=$osVersionMin"
)
KonanTarget.WATCHOS_X64 -> listOf(
"-stdlib=libc++",
"-isysroot", absoluteTargetSysRoot,
"--sysroot=$absoluteTargetSysRoot",
"-mwatchos-simulator-version-min=$osVersionMin"
)