提交 2a7ccb11 编写于 作者: S Svyatoslav Scherbina 提交者: Space

Native compiler: remove unused dependency on common/src/hash

上级 a471bbc1
...@@ -55,22 +55,6 @@ kotlinNativeInterop { ...@@ -55,22 +55,6 @@ kotlinNativeInterop {
linkerOpts "-L$llvmDir/lib", "-L${rootProject.project(':kotlin-native:llvmDebugInfoC').buildDir}", "-L${rootProject.project(':kotlin-native:llvmCoverageMappingC').buildDir}" linkerOpts "-L$llvmDir/lib", "-L${rootProject.project(':kotlin-native:llvmDebugInfoC').buildDir}", "-L${rootProject.project(':kotlin-native:llvmCoverageMappingC').buildDir}"
} }
hash { // TODO: copy-pasted from ':common:compileHash'
if (!rootProject.project(":kotlin-native").convention.plugins.platformInfo.isWindows()) {
compilerOpts '-fPIC'
linkerOpts '-fPIC'
}
linker 'clang++'
linkOutputs ":kotlin-native:common:${hostName}Hash"
headers fileTree('../common/src/hash/headers') {
include '**/*.h'
include '**/*.hpp'
}
pkg 'org.jetbrains.kotlin.backend.konan.hash'
}
files { files {
if (!project.project(":kotlin-native").convention.plugins.platformInfo.isWindows()) { if (!project.project(":kotlin-native").convention.plugins.platformInfo.isWindows()) {
compilerOpts '-fPIC' compilerOpts '-fPIC'
...@@ -153,7 +137,6 @@ dependencies { ...@@ -153,7 +137,6 @@ dependencies {
} }
compilerCompile kotlinNativeInterop['llvm'].configuration compilerCompile kotlinNativeInterop['llvm'].configuration
compilerCompile kotlinNativeInterop['hash'].configuration
compilerCompile kotlinNativeInterop['files'].configuration compilerCompile kotlinNativeInterop['files'].configuration
...@@ -240,7 +223,6 @@ task run { ...@@ -240,7 +223,6 @@ task run {
jar { jar {
from sourceSets.cli_bc.output, from sourceSets.cli_bc.output,
sourceSets.compiler.output, sourceSets.compiler.output,
sourceSets.hashInteropStubs.output,
sourceSets.filesInteropStubs.output, sourceSets.filesInteropStubs.output,
sourceSets.llvmInteropStubs.output sourceSets.llvmInteropStubs.output
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册