From 656edd73a7b12baa631ba14c2d953d28ce8f4277 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Mon, 30 Nov 2020 18:26:40 +0700 Subject: [PATCH] [linux_x64] Update toolchain Use the one built from c82b843e --- kotlin-native/konan/konan.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 30e5047ff12..d745f1a0616 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -368,27 +368,27 @@ 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 = target-gcc-toolchain-3-linux-x86-64 -targetToolchain.linux_x64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu +gccToolchain.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 +targetToolchain.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu dependencies.linux_x64 = \ - target-gcc-toolchain-3-linux-x86-64 \ + x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 \ 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 \ - target-gcc-toolchain-3-linux-x86-64 + x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64 dependencies.macos_x64-linux_x64 = \ libffi-3.2.1-3-darwin-macos \ - target-gcc-toolchain-3-linux-x86-64 + x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9 quadruple.linux_x64 = x86_64-unknown-linux-gnu -targetSysRoot.linux_x64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu/sysroot +targetSysRoot.linux_x64 = $gccToolchain.linux_x64/x86_64-unknown-linux-gnu/sysroot # targetSysroot-relative. -libGcc.linux_x64 = ../../lib/gcc/x86_64-unknown-linux-gnu/4.8.5 +libGcc.linux_x64 = ../../lib/gcc/x86_64-unknown-linux-gnu/8.3.0 targetCpu.linux_x64 = x86-64 clangFlags.linux_x64 = -cc1 -target-cpu $targetCpu.linux_x64 -emit-obj -disable-llvm-optzns -x ir clangNooptFlags.linux_x64 = -O1