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

Fix arm builds

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-05-21 09:44:22 +03:00
committed by Sergey Bogolepov
parent ce19014903
commit f78a54aed8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+2 -2
View File
@@ -22,8 +22,8 @@ kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buil
kotlinVersion=1.3.50-dev-259
testKotlinVersion=1.3.50-dev-259
# See https://teamcity.jetbrains.com/project.html?projectId=Kotlin_KotlinNativeShared&tab=projectOverview
sharedRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinNativeShared_BuildAndTest),number:1.0-dev-61,branch:mingw_android_arm64/artifacts/content/maven
sharedVersion=1.0-dev-61
sharedRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
sharedVersion=1.0-dev-57
konanVersion=1.3.0
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.workers.max=4
konan/konan.properties
+2 -2
View File
@@ -227,7 +227,7 @@ linkerOptimizationFlags.linux_arm32_hfp = --gc-sections
targetSysRoot.linux_arm32_hfp = target-sysroot-2-raspberrypi
# We could reuse host toolchain here.
linkerKonanFlags.linux_arm32_hfp = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthread \
--defsym __cxa_demangle=Konan_cxa_demangle
--defsym __cxa_demangle=Konan_cxa_demangle --no-threads
# targetSysroot-relative.
libGcc.linux_arm32_hfp = lib/gcc/arm-linux-gnueabihf/4.8.3
llvmLtoFlags.linux_arm32_hfp = -float-abi=hard -mcpu=arm1136jf-s
@@ -270,7 +270,7 @@ linkerOptimizationFlags.linux_arm64 = --gc-sections
targetSysRoot.linux_arm64 = target-sysroot-1-linux-glibc-arm64
# We could reuse host toolchain here.
linkerKonanFlags.linux_arm64 = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthread \
--defsym __cxa_demangle=Konan_cxa_demangle
--defsym __cxa_demangle=Konan_cxa_demangle --no-threads
# targetSysroot-relative.
libGcc.linux_arm64 = usr/lib
llvmLtoFlags.linux_arm64 = -mcpu=cortex-a57