diff options
author | Pavel Labath <labath@google.com> | 2016-11-17 11:22:23 +0000 |
---|---|---|
committer | Pavel Labath <labath@google.com> | 2016-11-17 11:22:23 +0000 |
commit | b83576ebbd5ccff138785a3004ec3fd06b195ca7 (patch) | |
tree | 617d9a2f2d62b2e427e5afcad6a3108f96500bee /CMakeLists.txt | |
parent | 189d9909bff65f2032e412a942ff9a8618d502c3 (diff) |
[cmake] Move LLVM_BUILD_STATIC check to an earlier point
Summary:
The motivation for this is to enable correct detection of dlopen() on Android.
Android does not provide a static version of libdl, so if we add the -static flag
after performing the check, it will succeed even though subsequent link steps
will fail. With this change we correctly detect the absence of libdl in a
LLVM_BUILD_STATIC build on Android.
The link itself still does not succeed because the code does not check the result
of this check properly, but I plan to fix that in a separate change.
Reviewers: beanz
Subscribers: danalbert, mgorny, srhines, tberghammer, llvm-commits
Differential Revision: https://reviews.llvm.org/D26463
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@287220 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f301bddaf4..2e9a4a14532 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -554,6 +554,10 @@ if (LLVM_BUILD_INSTRUMENTED OR LLVM_BUILD_INSTRUMENTED_COVERAGE) endif() endif() +if (LLVM_BUILD_STATIC) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") +endif() + # All options referred to from HandleLLVMOptions have to be specified # BEFORE this include, otherwise options will not be correctly set on # first cmake run |