diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index aa89665146f..2dad4a710e6 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -80,6 +80,11 @@ llvmVersion.macos_arm64 = 11.1.0 toolchainDependency.mingw_x64 = msys2-mingw-w64-x86_64-1 toolchainDependency.mingw_x86 = msys2-mingw-w64-i686-1 +toolchainDependency.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +toolchainDependency.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 +toolchainDependency.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +toolchainDependency.linux_mipsel32 = mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +toolchainDependency.linux_arm32_hfp = arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 cacheableTargets.macos_x64 = \ macos_x64 \ @@ -493,24 +498,24 @@ runtimeDefinitions.watchos_simulator_arm64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS= llvmHome.linux_x64 = $llvm.linux_x64.dev libffiDir.linux_x64 = libffi-3.2.1-2-linux-x86-64 -gccToolchain.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +gccToolchain.linux_x64 = $toolchainDependency.linux_x64 targetToolchain.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu dependencies.linux_x64 = \ - x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ + $toolchainDependency.linux_x64 \ lldb-4-linux targetToolchain.mingw_x64-linux_x64 = $llvmHome.mingw_x64 dependencies.mingw_x64-linux_x64 = \ - x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ + $toolchainDependency.linux_x64 \ $toolchainDependency.mingw_x64 targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64 dependencies.macos_x64-linux_x64 = \ - x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_x64 targetToolchain.macos_arm64-linux_x64 = $llvmHome.macos_arm64 dependencies.macos_arm64-linux_x64 = \ - x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_x64 targetTriple.linux_x64 = x86_64-unknown-linux-gnu targetSysRoot.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu/sysroot @@ -550,7 +555,7 @@ runtimeDefinitions.linux_x64 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_X64=1 \ USE_ELF_SYMBOLS=1 ELFSIZE=64 # Raspberry Pi -gccToolchain.linux_arm32_hfp = arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +gccToolchain.linux_arm32_hfp = $toolchainDependency.linux_arm32_hfp targetToolchain.linux_x64-linux_arm32_hfp = $gccToolchain.linux_arm32_hfp/arm-unknown-linux-gnueabihf targetToolchain.mingw_x64-linux_arm32_hfp = $llvmHome.mingw_x64 @@ -562,14 +567,14 @@ emulatorDependency.linux_x64-linux_arm32_hfp = qemu-arm-static-5.1.0-linux-2 emulatorExecutable.linux_x64-linux_arm32_hfp = qemu-arm-static-5.1.0-linux-2/qemu-arm dependencies.linux_x64-linux_arm32_hfp = \ - arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_arm32_hfp dependencies.mingw_x64-linux_arm32_hfp = \ - arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ + $toolchainDependency.linux_arm32_hfp \ $toolchainDependency.mingw_x64 dependencies.macos_x64-linux_arm32_hfp = \ - arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_arm32_hfp dependencies.macos_arm64-linux_arm32_hfp = \ - arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_arm32_hfp targetTriple.linux_arm32_hfp = arm-unknown-linux-gnueabihf linkerNoDebugFlags.linux_arm32_hfp = -S @@ -610,7 +615,7 @@ runtimeDefinitions.linux_arm32_hfp = USE_GCC_UNWIND=1 KONAN_LINUX=1 \ KONAN_ARM32=1 USE_ELF_SYMBOLS=1 ELFSIZE=32 KONAN_NO_UNALIGNED_ACCESS=1 # Linux arm64 -gccToolchain.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 +gccToolchain.linux_arm64 = $toolchainDependency.linux_arm64 targetToolchain.linux_x64-linux_arm64 = $gccToolchain.linux_arm64/aarch64-unknown-linux-gnu targetToolchain.mingw_x64-linux_arm64 = $llvmHome.mingw_x64 @@ -621,14 +626,14 @@ emulatorDependency.linux_x64-linux_arm64 = qemu-aarch64-static-5.1.0-linux-2 emulatorExecutable.linux_x64-linux_arm64 = qemu-aarch64-static-5.1.0-linux-2/qemu-aarch64 dependencies.linux_x64-linux_arm64 = \ - aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 + $toolchainDependency.linux_arm64 dependencies.mingw_x64-linux_arm64 = \ - aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \ + $toolchainDependency.linux_arm64 \ $toolchainDependency.mingw_x64 dependencies.macos_x64-linux_arm64 = \ - aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 + $toolchainDependency.linux_arm64 dependencies.macos_arm64-linux_arm64 = \ - aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 + $toolchainDependency.linux_arm64 targetTriple.linux_arm64 = aarch64-unknown-linux-gnu linkerNoDebugFlags.linux_arm64 = -S @@ -666,14 +671,14 @@ runtimeDefinitions.linux_arm64 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_ARM64=1 \ USE_ELF_SYMBOLS=1 ELFSIZE=64 # MIPS -gccToolchain.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +gccToolchain.linux_mips32 = $toolchainDependency.linux_mips32 targetToolchain.linux_x64-linux_mips32 = $gccToolchain.linux_mips32/mips-unknown-linux-gnu emulatorDependency.linux_x64-linux_mips32 = qemu-mips-static-5.1.0-linux-2 emulatorExecutable.linux_x64-linux_mips32 = qemu-mips-static-5.1.0-linux-2/qemu-mips dependencies.linux_x64-linux_mips32 = \ - mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_mips32 targetTriple.linux_mips32 = mips-unknown-linux-gnu linkerOptimizationFlags.linux_mips32 = --gc-sections @@ -708,14 +713,14 @@ runtimeDefinitions.linux_mips32 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_MIPS32=1 USE_ELF_SYMBOLS=1 ELFSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # MIPSel -gccToolchain.linux_mipsel32 = mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 +gccToolchain.linux_mipsel32 = $toolchainDependency.linux_mipsel32 targetToolchain.linux_x64-linux_mipsel32 = $gccToolchain.linux_mipsel32/mipsel-unknown-linux-gnu emulatorDependency.linux_x64-linux_mipsel32 = qemu-mipsel-static-5.1.0-linux-2 emulatorExecutable.linux_x64-linux_mipsel32 = qemu-mipsel-static-5.1.0-linux-2/qemu-mipsel dependencies.linux_x64-linux_mipsel32 = \ - mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 + $toolchainDependency.linux_mipsel32 targetTriple.linux_mipsel32 = mipsel-unknown-linux-gnu linkerOptimizationFlags.linux_mipsel32 = --gc-sections