Skip to content
This repository was archived by the owner on Aug 10, 2021. It is now read-only.

Commit 1d249ad

Browse files
committed
Fix #KT-45094
Rebuild linux toolchains with an older OS.
1 parent 83148fc commit 1d249ad

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

konan/konan.properties

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -408,22 +408,22 @@ runtimeDefinitions.watchos_x64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 \
408408
llvmHome.linux_x64 = $llvm.linux_x64.dev
409409
libffiDir.linux_x64 = libffi-3.2.1-2-linux-x86-64
410410

411-
gccToolchain.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9
411+
gccToolchain.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
412412
targetToolchain.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu
413413
dependencies.linux_x64 = \
414-
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 \
414+
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \
415415
libffi-3.2.1-2-linux-x86-64 \
416416
lldb-3-linux
417417

418418
targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
419419
dependencies.mingw_x64-linux_x64 = \
420420
libffi-3.2.1-mingw-w64-x86-64 \
421-
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9
421+
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
422422

423423
targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64
424424
dependencies.macos_x64-linux_x64 = \
425425
libffi-3.2.1-3-darwin-macos \
426-
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9
426+
x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
427427

428428
quadruple.linux_x64 = x86_64-unknown-linux-gnu
429429
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 \
459459
USE_ELF_SYMBOLS=1 ELFSIZE=64
460460

461461
# Raspberry Pi
462-
gccToolchain.linux_arm32_hfp = arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9
462+
gccToolchain.linux_arm32_hfp = arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2
463463

464464
targetToolchain.linux_x64-linux_arm32_hfp = $gccToolchain.linux_arm32_hfp/arm-unknown-linux-gnueabihf
465465
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
470470
emulatorExecutable.linux_x64-linux_arm32_hfp = qemu-arm-static-5.1.0-linux-2/qemu-arm
471471

472472
dependencies.linux_x64-linux_arm32_hfp = \
473-
arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9 \
473+
arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \
474474
libffi-3.2.1-2-linux-x86-64
475475
dependencies.mingw_x64-linux_arm32_hfp = \
476-
arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9 \
476+
arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \
477477
libffi-3.2.1-mingw-w64-x86-64
478478
dependencies.macos_x64-linux_arm32_hfp = \
479-
arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9 \
479+
arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \
480480
libffi-3.2.1-3-darwin-macos
481481

482482
quadruple.linux_arm32_hfp = arm-unknown-linux-gnueabihf
@@ -513,7 +513,7 @@ runtimeDefinitions.linux_arm32_hfp = USE_GCC_UNWIND=1 KONAN_LINUX=1 \
513513
KONAN_ARM32=1 USE_ELF_SYMBOLS=1 ELFSIZE=32 KONAN_NO_UNALIGNED_ACCESS=1
514514

515515
# Linux arm64
516-
gccToolchain.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9
516+
gccToolchain.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2
517517

518518
targetToolchain.linux_x64-linux_arm64 = $gccToolchain.linux_arm64/aarch64-unknown-linux-gnu
519519
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
523523
emulatorExecutable.linux_x64-linux_arm64 = qemu-aarch64-static-5.1.0-linux-2/qemu-aarch64
524524

525525
dependencies.linux_x64-linux_arm64 = \
526-
aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9 \
526+
aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \
527527
libffi-3.2.1-2-linux-x86-64
528528
dependencies.mingw_x64-linux_arm64 = \
529-
aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9 \
529+
aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \
530530
libffi-3.2.1-mingw-w64-x86-64
531531
dependencies.macos_x64-linux_arm64 = \
532-
aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9 \
532+
aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \
533533
libffi-3.2.1-3-darwin-macos
534534

535535
quadruple.linux_arm64 = aarch64-unknown-linux-gnu
@@ -565,14 +565,14 @@ runtimeDefinitions.linux_arm64 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_ARM64=1 \
565565
USE_ELF_SYMBOLS=1 ELFSIZE=64
566566

567567
# MIPS
568-
gccToolchain.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9
568+
gccToolchain.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
569569

570570
targetToolchain.linux_x64-linux_mips32 = $gccToolchain.linux_mips32/mips-unknown-linux-gnu
571571

572572
emulatorDependency.linux_x64-linux_mips32 = qemu-mips-static-5.1.0-linux-2
573573
emulatorExecutable.linux_x64-linux_mips32 = qemu-mips-static-5.1.0-linux-2/qemu-mips
574574
dependencies.linux_x64-linux_mips32 = \
575-
mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 \
575+
mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \
576576
libffi-3.2.1-2-linux-x86-64
577577

578578
quadruple.linux_mips32 = mips-unknown-linux-gnu
@@ -607,14 +607,14 @@ runtimeDefinitions.linux_mips32 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_MIPS32=1
607607
USE_ELF_SYMBOLS=1 ELFSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1
608608

609609
# MIPSel
610-
gccToolchain.linux_mipsel32 = mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9
610+
gccToolchain.linux_mipsel32 = mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
611611

612612
targetToolchain.linux_x64-linux_mipsel32 = $gccToolchain.linux_mipsel32/mipsel-unknown-linux-gnu
613613

614614
emulatorDependency.linux_x64-linux_mipsel32 = qemu-mipsel-static-5.1.0-linux-2
615615
emulatorExecutable.linux_x64-linux_mipsel32 = qemu-mipsel-static-5.1.0-linux-2/qemu-mipsel
616616
dependencies.linux_x64-linux_mipsel32 = \
617-
mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 \
617+
mipsel-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \
618618
libffi-3.2.1-2-linux-x86-64
619619

620620
quadruple.linux_mipsel32 = mipsel-unknown-linux-gnu

tools/toolchain_builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# We might want to switch to alpine, but it is not stable enough yet.
2-
FROM ubuntu:20.04
2+
FROM ubuntu:14.04
33

44
ENV TZ=Europe/Moscow
55
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
66

77
# Install crosstool-ng deps.
88
RUN apt-get update
99
RUN apt-get install -y curl gcc git g++ gperf bison flex texinfo help2man make libncurses5-dev \
10-
python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
10+
python3-dev autoconf automake libtool gawk wget bzip2 xz-utils unzip \
1111
patch libstdc++6 rsync
1212

1313
# Put a fix for strip.

0 commit comments

Comments
 (0)