6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

[CMake] LLVMSupport should be responsible to provide system_libs.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201077 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi
2014-02-10 10:52:19 +00:00
parent 282713c09b
commit fdc6308fa1
6 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/AddLLVM.cmake
View File

@@ -238,10 +238,6 @@ function(llvm_add_library name)
llvm_config(${name} ${ARG_LINK_COMPONENTS} ${LLVM_LINK_COMPONENTS}) llvm_config(${name} ${ARG_LINK_COMPONENTS} ${LLVM_LINK_COMPONENTS})
# Ensure that the system libraries always comes last on the
# list. Without this, linking the unit tests on MinGW fails.
link_system_libs( ${name} )
if(LLVM_COMMON_DEPENDS) if(LLVM_COMMON_DEPENDS)
add_dependencies(${name} ${LLVM_COMMON_DEPENDS}) add_dependencies(${name} ${LLVM_COMMON_DEPENDS})
endif() endif()
@@ -330,7 +326,6 @@ macro(add_llvm_executable name)
if( LLVM_COMMON_DEPENDS ) if( LLVM_COMMON_DEPENDS )
add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
endif( LLVM_COMMON_DEPENDS ) endif( LLVM_COMMON_DEPENDS )
link_system_libs( ${name} )
endmacro(add_llvm_executable name) endmacro(add_llvm_executable name)

5
cmake/modules/TableGen.cmake
View File

@@ -117,15 +117,10 @@ macro(add_tablegen target project)
endif() endif()
if( MINGW ) if( MINGW )
target_link_libraries(${target} imagehlp psapi shell32)
if(CMAKE_SIZEOF_VOID_P MATCHES "8") if(CMAKE_SIZEOF_VOID_P MATCHES "8")
set_target_properties(${target} PROPERTIES LINK_FLAGS -Wl,--stack,16777216) set_target_properties(${target} PROPERTIES LINK_FLAGS -Wl,--stack,16777216)
endif(CMAKE_SIZEOF_VOID_P MATCHES "8") endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
endif( MINGW ) endif( MINGW )
if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD AND NOT BEOS )
target_link_libraries(${target} pthread)
endif()
if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY) if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
install(TARGETS ${target} install(TARGETS ${target}
EXPORT LLVMExports EXPORT LLVMExports

2
lib/Support/CMakeLists.txt
View File

@@ -117,3 +117,5 @@ add_llvm_library(LLVMSupport
Windows/TimeValue.inc Windows/TimeValue.inc
Windows/Watchdog.inc Windows/Watchdog.inc
) )
link_system_libs(LLVMSupport)

6
utils/FileCheck/CMakeLists.txt
View File

@@ -3,9 +3,3 @@ add_llvm_utility(FileCheck
) )
target_link_libraries(FileCheck LLVMSupport) target_link_libraries(FileCheck LLVMSupport)
if( MINGW )
target_link_libraries(FileCheck imagehlp psapi shell32)
endif( MINGW )
if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD )
target_link_libraries(FileCheck pthread)
endif()

6
utils/FileUpdate/CMakeLists.txt
View File

@@ -3,9 +3,3 @@ add_llvm_utility(FileUpdate
) )
target_link_libraries(FileUpdate LLVMSupport) target_link_libraries(FileUpdate LLVMSupport)
if( MINGW )
target_link_libraries(FileUpdate imagehlp psapi shell32)
endif( MINGW )
if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD )
target_link_libraries(FileUpdate pthread)
endif()

6
utils/not/CMakeLists.txt
View File

@@ -3,9 +3,3 @@ add_llvm_utility(not
) )
target_link_libraries(not LLVMSupport) target_link_libraries(not LLVMSupport)
if( MINGW )
target_link_libraries(not imagehlp psapi shell32)
endif( MINGW )
if( LLVM_ENABLE_THREADS AND HAVE_LIBPTHREAD )
target_link_libraries(not pthread)
endif()