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

fix build: mac and linux should take llvm libraries from dependencies/all/clang+llvm..., instead from system path

Browse Source
This commit is contained in:
Vasily Levchenko
2016-10-26 22:23:57 +03:00
parent 202d03644d
commit e721a4e19d
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+34 -1
View File
@@ -39,7 +39,38 @@ kotlinNativeInterop {
llvm { llvm {
defFile 'llvm.def' defFile 'llvm.def'
compilerOpts "-I$llvmDir/include" compilerOpts "-I$llvmDir/include"
linkerOpts "-L$llvmDir/lib -L$libffiDir/lib -lffi" linkerOpts "-L$llvmDir/lib -lc++ ",
"-Wl,--whole-archive",
"-lLLVMX86Disassembler",
"-lLLVMX86AsmParser",
"-lLLVMX86CodeGen",
"-lLLVMSelectionDAG",
"-lLLVMAsmPrinter",
"-lLLVMX86Desc",
"-lLLVMMCDisassembler",
"-lLLVMX86Info",
"-lLLVMX86AsmPrinter",
"-lLLVMX86Utils",
"-lLLVMInterpreter",
"-lLLVMCodeGen",
"-lLLVMScalarOpts",
"-lLLVMInstCombine",
"-lLLVMInstrumentation",
"-lLLVMProfileData",
"-lLLVMTransformUtils",
"-lLLVMBitWriter",
"-lLLVMExecutionEngine",
"-lLLVMTarget",
"-lLLVMAnalysis",
"-lLLVMRuntimeDyld",
"-lLLVMObject",
"-lLLVMMCParser",
"-lLLVMBitReader",
"-lLLVMMC",
"-lLLVMCore",
"-lLLVMSupport",
"-Wl,--no-whole-archive",
"-L$libffiDir/lib -lffi"
} }
hash { // TODO: copy-pasted from ':common:compileHash' hash { // TODO: copy-pasted from ':common:compileHash'
@@ -92,6 +123,8 @@ task run(type: JavaExec) {
doFirst { doFirst {
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"
} }
backend.native/llvm.def
+1 -13
View File
@@ -12,24 +12,12 @@ linkerOpts = -stdlib=libc++ -fPIC -fvisibility-inlines-hidden \
-Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers \ -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers \
-pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor \ -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor \
-std=c++11 \ -std=c++11 \
-DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \ -DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
linkerOpts.osx = \ linkerOpts.osx = \
-Wl,-search_paths_first -Wl,-headerpad_max_install_names \ -Wl,-search_paths_first -Wl,-headerpad_max_install_names \
-lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter \
-lLLVMX86Desc -lLLVMMCDisassembler -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMInterpreter \
-lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMInstrumentation -lLLVMProfileData -lLLVMTransformUtils \
-lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \
-lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \
-lpthread -lz -lm -lcurses -lpthread -lz -lm -lcurses
linkerOpts.linux=\ linkerOpts.linux=\
-Wl,--whole-archive \
-lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter \
-lLLVMX86Desc -lLLVMMCDisassembler -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMInterpreter \
-lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMInstrumentation -lLLVMProfileData -lLLVMTransformUtils \
-lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \
-lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \
-Wl,--no-whole-archive \
-lrt -ldl -lpthread -lz -lm \ -lrt -ldl -lpthread -lz -lm \
-Wl,-z,noexecstack -Wl,-z,noexecstack