diff --git a/backend.native/konan.properties b/backend.native/konan.properties index f8962db1db1..1a48ee003c9 100644 --- a/backend.native/konan.properties +++ b/backend.native/konan.properties @@ -7,7 +7,7 @@ dependenciesUrl = https://jetbrains.bintray.com/kotlin-native-dependencies arch.osx = x86_64 sysRoot.osx = target-sysroot-1-darwin-macos libffiDir.osx = libffi-3.2.1-2-darwin-macos -llvmHome.osx = clang+llvm-3.9.0-darwin-macos +llvmHome.osx = clang-llvm-3.9.0-darwin-macos llvmLtoFlags.osx = -exported-symbol=_Konan_main llvmLtoOptFlags.osx = -O3 -function-sections llvmLtoNooptFlags.osx = -O1 @@ -16,14 +16,14 @@ linkerKonanFlags.osx = -lc++ linkerOptimizationFlags.osx = -dead_strip osVersionMin.osx = -macosx_version_min 10.10.0 entrySelector.osx = -alias _Konan_main _main -dependencies.osx = target-sysroot-1-darwin-macos libffi-3.2.1-2-darwin-macos clang+llvm-3.9.0-darwin-macos +dependencies.osx = target-sysroot-1-darwin-macos libffi-3.2.1-2-darwin-macos clang-llvm-3.9.0-darwin-macos # iphone arch.osx-ios = arm64 sysRoot.osx-ios = target-sysroot-1-darwin-macos targetSysRoot.osx-ios = target-sysroot-2-darwin-ios libffiDir.osx-ios = libffi-3.2.1-2-darwin-ios -llvmHome.osx-ios = clang+llvm-3.9.0-darwin-macos +llvmHome.osx-ios = clang-llvm-3.9.0-darwin-macos llvmLlcFlags.osx-ios = -mtriple=arm64-apple-ios5.0.0 --disable-fp-elim linkerKonanFlags.osx-ios = -lc++ linkerOptimizationFlags.osx-ios = -dead_strip @@ -31,7 +31,7 @@ osVersionMin.osx-ios = -iphoneos_version_min 5.0.0 entrySelector.osx-ios = -alias _Konan_main _main dependencies.osx-ios = target-sysroot-1-darwin-macos \ libffi-3.2.1-2-darwin-ios \ - clang+llvm-3.9.0-darwin-macos \ + clang-llvm-3.9.0-darwin-macos \ target-sysroot-2-darwin-ios # iphone_sim @@ -39,7 +39,7 @@ arch.osx-ios-sim = x86_64 sysRoot.osx-ios-sim = target-sysroot-1-darwin-macos targetSysRoot.osx-ios-sim = target-sysroot-1-darwin-ios-sim libffiDir.osx-ios-sim = libffi-3.2.1-2-darwin-ios-sim -llvmHome.osx-ios-sim = clang+llvm-3.9.0-darwin-macos +llvmHome.osx-ios-sim = clang-llvm-3.9.0-darwin-macos llvmLlcFlags.osx-ios-sim = -mtriple=x86_64-apple-ios5.0.0 --disable-fp-elim linkerKonanFlags.osx-ios-sim = -lc++ linkerOptimizationFlags.osx-ios-sim = -dead_strip @@ -47,13 +47,13 @@ osVersionMin.osx-ios-sim = -ios_simulator_version_min 5.0.0 entrySelector.osx-ios-sim = -alias _Konan_main _main dependencies.osx-ios-sim = target-sysroot-1-darwin-macos \ libffi-3.2.1-2-darwin-ios-sim \ - clang+llvm-3.9.0-darwin-macos \ + clang-llvm-3.9.0-darwin-macos \ target-sysroot-1-darwin-ios-sim # linux sysRoot.linux = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu/sysroot libffiDir.linux = libffi-3.2.1-2-linux-x86-64 -llvmHome.linux = clang+llvm-3.9.0-linux-x86-64 +llvmHome.linux = clang-llvm-3.9.0-linux-x86-64 libGcc.linux = target-gcc-toolchain-3-linux-x86-64/lib/gcc/x86_64-unknown-linux-gnu/4.8.5 gccToolChain.linux = target-gcc-toolchain-3-linux-x86-64 llvmLtoFlags.linux = -exported-symbol=Konan_main @@ -64,20 +64,20 @@ linkerKonanFlags.linux = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lpthread linkerOptimizationFlags.linux = --gc-sections pluginOptimizationFlags.linux = -plugin-opt=mcpu=x86-64 -plugin-opt=O3 entrySelector.linux = --defsym main=Konan_main -dependencies.linux = clang+llvm-3.9.0-linux-x86-64 target-gcc-toolchain-3-linux-x86-64 libffi-3.2.1-2-linux-x86-64 +dependencies.linux = clang-llvm-3.9.0-linux-x86-64 target-gcc-toolchain-3-linux-x86-64 libffi-3.2.1-2-linux-x86-64 # Raspberry Pi arch.linux-raspberrypi = armv7 sysRoot.linux-raspberrypi = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu/sysroot targetSysRoot.linux-raspberrypi = target-sysroot-1-raspberrypi libffiDir.linux-raspberrypi = libffi-3.2.1-2-raspberrypi -llvmHome.linux-raspberrypi = clang+llvm-3.9.0-linux-x86-64 +llvmHome.linux-raspberrypi = clang-llvm-3.9.0-linux-x86-64 libGcc.linux-raspberrypi = target-sysroot-1-raspberrypi/lib/gcc/arm-linux-gnueabihf/4.8.3/ gccToolChain.linux-raspberrypi = target-gcc-toolchain-3-linux-x86-64 llvmLlcFlags.linux-raspberrypi = -mtriple=armv7-unknown-linux-gnueabihf --disable-fp-elim -float-abi=hard linkerKonanFlags.linux-raspberrypi = -Bstatic -lstdc++ -Bdynamic -ldl -lm -lc -lpthread -fuse-ld=gold entrySelector.linux-raspberrypi = --defsym main=Konan_main -dependencies.linux-raspberrypi = clang+llvm-3.9.0-linux-x86-64 \ +dependencies.linux-raspberrypi = clang-llvm-3.9.0-linux-x86-64 \ target-gcc-toolchain-3-linux-x86-64 \ target-sysroot-1-raspberrypi \ libffi-3.2.1-2-linux-x86-64 \ diff --git a/dependencies/build.gradle b/dependencies/build.gradle index 1246e3f8082..19569f2fb9b 100644 --- a/dependencies/build.gradle +++ b/dependencies/build.gradle @@ -101,7 +101,7 @@ task hostLibffi(type: HelperNativeDep) { } task llvm(type: HelperNativeDep) { - baseName = "clang+llvm-$llvmVersion-$host" + baseName = "clang-llvm-$llvmVersion-$host" } if (isLinux()) {