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

Enable linuxX64 target on macOsArm64 host

Browse Source 
Because tests for Gradle plugin assumes that linuxX64
is available on all hosts.
This commit is contained in:
Sergey Bogolepov
2021-03-22 14:45:40 +07:00
committed by TeamCityServer
parent 7e18b69e7d
commit 8ba4f060f0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/konan/konan.properties
+5
View File
@@ -450,6 +450,11 @@ dependencies.macos_x64-linux_x64 = \
libffi-3.2.1-3-darwin-macos \ libffi-3.2.1-3-darwin-macos \
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
targetToolchain.macos_arm64-linux_x64 = $llvmHome.macos_arm64
dependencies.macos_arm64-linux_x64 = \
libffi-3.3-1-macos-arm64 \
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
quadruple.linux_x64 = x86_64-unknown-linux-gnu quadruple.linux_x64 = x86_64-unknown-linux-gnu
targetSysRoot.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu/sysroot targetSysRoot.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu/sysroot
# targetSysroot-relative. # targetSysroot-relative.
native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
+2 -1
View File
@@ -95,7 +95,8 @@ open class HostManager(
MACOS_ARM64 to setOf( MACOS_ARM64 to setOf(
// TODO: More targets will be added later after additional testing. // TODO: More targets will be added later after additional testing.
MACOS_ARM64, MACOS_ARM64,
IOS_ARM64 IOS_ARM64,
LINUX_X64
) )
) )