RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-07 04:46:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[cmake] Move LLVM_BUILD_STATIC check to an earlier point

Browse Source 
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
This commit is contained in:
Pavel Labath 2016-11-17 11:22:23 +00:00
parent 189d9909bf
commit b83576ebbd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -554,6 +554,10 @@ if (LLVM_BUILD_INSTRUMENTED OR LLVM_BUILD_INSTRUMENTED_COVERAGE)
endif() endif()
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 # All options referred to from HandleLLVMOptions have to be specified
# BEFORE this include, otherwise options will not be correctly set on # BEFORE this include, otherwise options will not be correctly set on
# first cmake run # first cmake run

4
cmake/modules/HandleLLVMOptions.cmake
View File

@ -180,10 +180,6 @@ if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
endif( LLVM_BUILD_32_BITS ) endif( LLVM_BUILD_32_BITS )
endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 ) endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
if (LLVM_BUILD_STATIC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
endif()
if( XCODE ) if( XCODE )
# For Xcode enable several build settings that correspond to # For Xcode enable several build settings that correspond to
# many warnings that are on by default in Clang but are # many warnings that are on by default in Clang but are