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

fix build: (mac and linux)

Browse Source 
common fix of build: add to link flags -LlibffiDir -lffi
llvm.def: os specific remove from ldflags -lffi, it shoould appear after -LlibffiDir...
This commit is contained in:
Vasily Levchenko
2016-10-26 21:14:43 +03:00
parent 2690c87b9f
commit 202d03644d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+1 -1
View File
@@ -39,7 +39,7 @@ kotlinNativeInterop {
llvm { llvm {
defFile 'llvm.def' defFile 'llvm.def'
compilerOpts "-I$llvmDir/include" compilerOpts "-I$llvmDir/include"
linkerOpts "-L$llvmDir/lib" linkerOpts "-L$llvmDir/lib -L$libffiDir/lib -lffi"
} }
hash { // TODO: copy-pasted from ':common:compileHash' hash { // TODO: copy-pasted from ':common:compileHash'
backend.native/llvm.def
+2 -2
View File
@@ -21,7 +21,7 @@ linkerOpts.osx = \
-lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMInstrumentation -lLLVMProfileData -lLLVMTransformUtils \ -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMInstrumentation -lLLVMProfileData -lLLVMTransformUtils \
-lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \ -lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \
-lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \ -lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \
-lpthread -lz -lm -lcurses -lffi -lpthread -lz -lm -lcurses
linkerOpts.linux=\ linkerOpts.linux=\
-Wl,--whole-archive \ -Wl,--whole-archive \
@@ -31,5 +31,5 @@ linkerOpts.linux=\
-lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \ -lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \
-lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \ -lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \
-Wl,--no-whole-archive \ -Wl,--no-whole-archive \
-lrt -ldl -lpthread -lz -lm -lffi \ -lrt -ldl -lpthread -lz -lm \
-Wl,-z,noexecstack -Wl,-z,noexecstack