diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-12-05 17:25:52 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-12-05 17:25:52 +0000 |
| commit | 9c8ebeb03d53ecc77281786d14cacd552dee1d6d (patch) | |
| tree | 3036f93e9f8ed4602cf3dc70d85a791d74baa9d9 /llvm/tools | |
| parent | 5a03a9919f0c21548b4b4d75dc47e484eeb81a10 (diff) | |
| download | bcm5719-llvm-9c8ebeb03d53ecc77281786d14cacd552dee1d6d.tar.gz bcm5719-llvm-9c8ebeb03d53ecc77281786d14cacd552dee1d6d.zip | |
Be less conservative about when we build the gold plugin.
It is only build if LLVM_BINUTILS_INCDIR is explicitly given, so there is
no point in having extra restrictions.
llvm-svn: 223481
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | llvm/tools/gold/CMakeLists.txt | 6 |
2 files changed, 2 insertions, 16 deletions
diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt index 5905baf9813..9ea5543a0b3 100644 --- a/llvm/tools/CMakeLists.txt +++ b/llvm/tools/CMakeLists.txt @@ -68,17 +68,7 @@ else() ignore_llvm_tool_subdirectory(llvm-lto) endif() -if( LLVM_ENABLE_PIC ) - # TODO: support other systems: - if( (CMAKE_SYSTEM_NAME STREQUAL "Linux") - OR (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ) - add_llvm_tool_subdirectory(gold) - else() - ignore_llvm_tool_subdirectory(gold) - endif() -else() - ignore_llvm_tool_subdirectory(gold) -endif() +add_llvm_tool_subdirectory(gold) add_llvm_external_project(clang) add_llvm_external_project(llgo) diff --git a/llvm/tools/gold/CMakeLists.txt b/llvm/tools/gold/CMakeLists.txt index 30330101829..a70905c84bf 100644 --- a/llvm/tools/gold/CMakeLists.txt +++ b/llvm/tools/gold/CMakeLists.txt @@ -3,11 +3,7 @@ set(LLVM_BINUTILS_INCDIR "" CACHE PATH set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/gold.exports) -if( NOT LLVM_BINUTILS_INCDIR ) - # Nothing to say. -elseif( NOT EXISTS "${LLVM_BINUTILS_INCDIR}/plugin-api.h" ) - message(STATUS "plugin-api.h not found. gold plugin excluded from the build.") -else() +if( LLVM_ENABLE_PIC AND LLVM_BINUTILS_INCDIR ) include_directories( ${LLVM_BINUTILS_INCDIR} ) # Because off_t is used in the public API, the largefile parts are required for |
