azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux build fix: static/dynamic and libraries ordering

Browse Source
This commit is contained in:
Vasily Levchenko
2016-10-27 12:34:20 +03:00
parent 8f9e6961e6
commit dd6abfa188
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+7 -5
View File
@@ -66,9 +66,12 @@ String[] linkerOpts1() {
'-lLLVMSupport'] '-lLLVMSupport']
List<String> ldflags = new ArrayList<>() List<String> ldflags = new ArrayList<>()
if (System.properties['os.name'].startsWith("Linux")) if (System.properties['os.name'].startsWith("Linux"))
ldflags.addAll(["-L$llvmDir/lib", "-lc++", "-Wl,-whole-archive"] ldflags.addAll(["-L$llvmDir/lib",
"-Wl,-Bstatic", "-Wl,--whole-archive"]
+ libs + libs
+ ["-Wl,-no-whole-archieve", "-L$libffiDir/lib -lffi"]) + ["-Wl,--no-whole-archive", "-Wl,-Bdynamic",
"-L$libffiDir/lib -lffi",
"-lrt", "-ldl","-lpthread", "-lz", "-lm"])
else else
ldflags.addAll(["-L$llvmDir/lib", "-lc++"] ldflags.addAll(["-L$llvmDir/lib", "-lc++"]
+ libs + libs
@@ -81,7 +84,7 @@ String[] linkerOpts1() {
kotlinNativeInterop { kotlinNativeInterop {
llvm { llvm {
defFile 'llvm.def' defFile 'llvm.def'
compilerOpts "-I$llvmDir/include" compilerOpts "-fPIC", "-I$llvmDir/include"
linkerOpts linkerOpts1() linkerOpts linkerOpts1()
} }
@@ -128,7 +131,7 @@ task run(type: JavaExec) {
args '-output', "$buildDir/out.bc" args '-output', "$buildDir/out.bc"
jvmArgs '-ea', "-Djava.library.path=${llvmDir}/lib:${project.buildDir}/nativelibs" jvmArgs '-ea', "-Djava.library.path=${project.buildDir}/nativelibs"
dependsOn ':runtime:build' dependsOn ':runtime:build'
@@ -136,7 +139,6 @@ task run(type: JavaExec) {
args '-runtime', project(':runtime').build.outputs.files.singleFile args '-runtime', project(':runtime').build.outputs.files.singleFile
} }
environment 'LD_LIBRARY_PATH' : "${llvmDir}/lib:${project.buildDir}/nativelibs" environment 'LD_LIBRARY_PATH' : "${llvmDir}/lib:${project.buildDir}/nativelibs"
} }