diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index b7954475309..c2419bc6a2f 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -408,22 +408,22 @@ runtimeDefinitions.watchos_x64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 \ 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 +gccToolchain.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 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 \ + x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ libffi-3.2.1-2-linux-x86-64 \ lldb-3-linux targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 dependencies.mingw_x64-linux_x64 = \ libffi-3.2.1-mingw-w64-x86-64 \ - x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 + x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64 dependencies.macos_x64-linux_x64 = \ libffi-3.2.1-3-darwin-macos \ - x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 + x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 quadruple.linux_x64 = x86_64-unknown-linux-gnu targetSysRoot.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu/sysroot @@ -459,7 +459,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 +gccToolchain.linux_arm32_hfp = arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 targetToolchain.linux_x64-linux_arm32_hfp = $gccToolchain.linux_arm32_hfp/arm-unknown-linux-gnueabihf targetToolchain.mingw_x64-linux_arm32_hfp = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 @@ -470,13 +470,13 @@ 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 \ + arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ libffi-3.2.1-2-linux-x86-64 dependencies.mingw_x64-linux_arm32_hfp = \ - arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9 \ + arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ libffi-3.2.1-mingw-w64-x86-64 dependencies.macos_x64-linux_arm32_hfp = \ - arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9 \ + arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ libffi-3.2.1-3-darwin-macos quadruple.linux_arm32_hfp = arm-unknown-linux-gnueabihf @@ -513,7 +513,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 +gccToolchain.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 targetToolchain.linux_x64-linux_arm64 = $gccToolchain.linux_arm64/aarch64-unknown-linux-gnu targetToolchain.mingw_x64-linux_arm64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 @@ -523,13 +523,13 @@ 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 \ + aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \ libffi-3.2.1-2-linux-x86-64 dependencies.mingw_x64-linux_arm64 = \ - aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9 \ + aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \ libffi-3.2.1-mingw-w64-x86-64 dependencies.macos_x64-linux_arm64 = \ - aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9 \ + aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \ libffi-3.2.1-3-darwin-macos quadruple.linux_arm64 = aarch64-unknown-linux-gnu @@ -565,14 +565,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 +gccToolchain.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 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 \ + mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ libffi-3.2.1-2-linux-x86-64 quadruple.linux_mips32 = mips-unknown-linux-gnu @@ -607,14 +607,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 +gccToolchain.linux_mipsel32 = mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 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 \ + mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ libffi-3.2.1-2-linux-x86-64 quadruple.linux_mipsel32 = mipsel-unknown-linux-gnu diff --git a/kotlin-native/tools/toolchain_builder/Dockerfile b/kotlin-native/tools/toolchain_builder/Dockerfile index 8bb3e5c2030..2db24b99036 100644 --- a/kotlin-native/tools/toolchain_builder/Dockerfile +++ b/kotlin-native/tools/toolchain_builder/Dockerfile @@ -1,5 +1,5 @@ # We might want to switch to alpine, but it is not stable enough yet. -FROM ubuntu:20.04 +FROM ubuntu:14.04 ENV TZ=Europe/Moscow RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -7,7 +7,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # Install crosstool-ng deps. RUN apt-get update RUN apt-get install -y curl gcc git g++ gperf bison flex texinfo help2man make libncurses5-dev \ - python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ + python3-dev autoconf automake libtool gawk wget bzip2 xz-utils unzip \ patch libstdc++6 rsync # Put a fix for strip.