From f3a382044a4dbfaa8af15ede0a1302420e47b894 Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Thu, 11 Jul 2019 14:39:38 +0300 Subject: [PATCH 1/3] Add lldb as dependency --- konan/konan.properties | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/konan/konan.properties b/konan/konan.properties index 865ba5b2ed8..fb33a15782c 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -61,6 +61,7 @@ osVersionMin.macos_x64 = 10.11 entrySelector.macos_x64 = -alias _Konan_main _main dependencies.macos_x64 = \ libffi-3.2.1-3-darwin-macos \ + lldb-171-macos.tar.gz \ clang-llvm-6.0.1-darwin-macos target-sysroot-9-macos_x64.default = \ @@ -163,7 +164,8 @@ targetToolchain.linux_x64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-l dependencies.linux_x64 = \ clang-llvm-6.0.1-linux-x86-64 \ target-gcc-toolchain-3-linux-x86-64 \ - libffi-3.2.1-2-linux-x86-64 + libffi-3.2.1-2-linux-x86-64 \ + lldb-122-linux.tar.gz gccToolchain.mingw_x64 = target-gcc-toolchain-3-linux-x86-64 targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 @@ -407,7 +409,8 @@ targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llv targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 dependencies.mingw_x64 = \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \ - libffi-3.2.1-mingw-w64-x86-64 + libffi-3.2.1-mingw-w64-x86-64 \ + lldb-23-windows.zip dependencies.linux_x64-mingw_x64 = \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \ clang-llvm-6.0.1-linux-x86-64 \ From 2b3a7ffe7bf6d55a35a44c2176451c02a27eb770 Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Thu, 11 Jul 2019 15:21:55 +0300 Subject: [PATCH 2/3] Remove file extension --- konan/konan.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/konan/konan.properties b/konan/konan.properties index fb33a15782c..b4929da3aa6 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -61,7 +61,7 @@ osVersionMin.macos_x64 = 10.11 entrySelector.macos_x64 = -alias _Konan_main _main dependencies.macos_x64 = \ libffi-3.2.1-3-darwin-macos \ - lldb-171-macos.tar.gz \ + lldb-171-macos \ clang-llvm-6.0.1-darwin-macos target-sysroot-9-macos_x64.default = \ @@ -165,7 +165,7 @@ dependencies.linux_x64 = \ clang-llvm-6.0.1-linux-x86-64 \ target-gcc-toolchain-3-linux-x86-64 \ libffi-3.2.1-2-linux-x86-64 \ - lldb-122-linux.tar.gz + lldb-122-linux gccToolchain.mingw_x64 = target-gcc-toolchain-3-linux-x86-64 targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 @@ -410,7 +410,7 @@ targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llv dependencies.mingw_x64 = \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \ libffi-3.2.1-mingw-w64-x86-64 \ - lldb-23-windows.zip + lldb-23-windows dependencies.linux_x64-mingw_x64 = \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \ clang-llvm-6.0.1-linux-x86-64 \ From cb45308af9db14b8dae765e2f42a54ba80d0944e Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Fri, 12 Jul 2019 08:33:47 +0300 Subject: [PATCH 3/3] Synchronized versioning --- konan/konan.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/konan/konan.properties b/konan/konan.properties index b4929da3aa6..5ef859c3e9f 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -61,7 +61,7 @@ osVersionMin.macos_x64 = 10.11 entrySelector.macos_x64 = -alias _Konan_main _main dependencies.macos_x64 = \ libffi-3.2.1-3-darwin-macos \ - lldb-171-macos \ + lldb-1-macos \ clang-llvm-6.0.1-darwin-macos target-sysroot-9-macos_x64.default = \ @@ -165,7 +165,7 @@ dependencies.linux_x64 = \ clang-llvm-6.0.1-linux-x86-64 \ target-gcc-toolchain-3-linux-x86-64 \ libffi-3.2.1-2-linux-x86-64 \ - lldb-122-linux + lldb-1-linux gccToolchain.mingw_x64 = target-gcc-toolchain-3-linux-x86-64 targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 @@ -410,7 +410,7 @@ targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llv dependencies.mingw_x64 = \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \ libffi-3.2.1-mingw-w64-x86-64 \ - lldb-23-windows + lldb-1-windows dependencies.linux_x64-mingw_x64 = \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \ clang-llvm-6.0.1-linux-x86-64 \