From 202d03644d2f065b103778e86503832776838d9d Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Wed, 26 Oct 2016 21:14:43 +0300 Subject: [PATCH] fix build: (mac and linux) common fix of build: add to link flags -LlibffiDir -lffi llvm.def: os specific remove from ldflags -lffi, it shoould appear after -LlibffiDir... --- backend.native/build.gradle | 2 +- backend.native/llvm.def | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend.native/build.gradle b/backend.native/build.gradle index 2a03ef8f04a..159be790468 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -39,7 +39,7 @@ kotlinNativeInterop { llvm { defFile 'llvm.def' compilerOpts "-I$llvmDir/include" - linkerOpts "-L$llvmDir/lib" + linkerOpts "-L$llvmDir/lib -L$libffiDir/lib -lffi" } hash { // TODO: copy-pasted from ':common:compileHash' diff --git a/backend.native/llvm.def b/backend.native/llvm.def index df90791c195..abe581fd2e5 100644 --- a/backend.native/llvm.def +++ b/backend.native/llvm.def @@ -21,7 +21,7 @@ linkerOpts.osx = \ -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMInstrumentation -lLLVMProfileData -lLLVMTransformUtils \ -lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \ -lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \ - -lpthread -lz -lm -lcurses -lffi + -lpthread -lz -lm -lcurses linkerOpts.linux=\ -Wl,--whole-archive \ @@ -31,5 +31,5 @@ linkerOpts.linux=\ -lLLVMBitWriter -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser \ -lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport \ -Wl,--no-whole-archive \ - -lrt -ldl -lpthread -lz -lm -lffi \ + -lrt -ldl -lpthread -lz -lm \ -Wl,-z,noexecstack