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

Add platform zlib for Linux arm32. (#2903)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-04-22 15:49:32 +03:00
committed by GitHub
parent 9f5e4c3634
commit 248414a1c2
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/konan.properties
+4 -4
View File
@@ -189,25 +189,25 @@ targetToolchain.macos_x64-linux_arm32_hfp = clang-llvm-6.0.1-darwin-macos
dependencies.linux_x64-linux_arm32_hfp = \
clang-llvm-6.0.1-linux-x86-64 \
target-gcc-toolchain-3-linux-x86-64 \
target-sysroot-1-raspberrypi \
target-sysroot-2-raspberrypi \
libffi-3.2.1-2-linux-x86-64
dependencies.mingw_x64-linux_arm32_hfp = \
msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
libffi-3.2.1-mingw-w64-x86-64 \
target-gcc-toolchain-3-linux-x86-64 \
target-sysroot-1-raspberrypi
target-sysroot-2-raspberrypi
dependencies.macos_x64-linux_arm32_hfp = \
clang-llvm-6.0.1-darwin-macos \
libffi-3.2.1-3-darwin-macos \
target-gcc-toolchain-3-linux-x86-64 \
target-sysroot-1-raspberrypi
target-sysroot-2-raspberrypi
quadruple.linux_arm32_hfp = armv6-unknown-linux-gnueabihf
entrySelector.linux_arm32_hfp = --defsym main=Konan_main
linkerNoDebugFlags.linux_arm32_hfp = -S
linkerDynamicFlags.linux_arm32_hfp = -shared
linkerOptimizationFlags.linux_arm32_hfp = --gc-sections
targetSysRoot.linux_arm32_hfp = target-sysroot-1-raspberrypi
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
platformLibs/build.gradle
+2 -3
View File
@@ -32,10 +32,9 @@ private ArrayList<DefFile> targetDefFiles(KonanTarget target) {
file("src/platform/${getVisibleName(target.family)}")
.listFiles()
.findAll { it.name.endsWith(".def") }
// The libz.a/libz.so and zlib.h are missing in raspberrypi and mips sysroots.
// The libz.a/libz.so and zlib.h are missing in MIPS sysroots.
// Just workaround it until we have sysroots corrected.
.findAll { ! ((target instanceof KonanTarget.LINUX_ARM32_HFP ||
target instanceof KonanTarget.LINUX_MIPS32 ||
.findAll { ! ((target instanceof KonanTarget.LINUX_MIPS32 ||
target instanceof KonanTarget.LINUX_MIPSEL32) && it.name == 'zlib.def') }
.collect { TargetDefFileKt.DefFile(it, target) }
}