diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-03-21 22:53:51 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-03-21 22:53:51 +0000 |
| commit | 89234e1e28a150138ea46dd3bee7c44d3dc0e4fe (patch) | |
| tree | f1164730bccb787699778e898a3cbb09c4aaed00 | |
| parent | 6e56331ed99e5b96de940dfdc53e438eef521a2e (diff) | |
Removed workaround for unspecified build problem on MinGW.
Tested that MinGW/MSYS builds fine without that.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128033 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e7e59707a..9474ca819b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,15 +185,6 @@ include(AddLLVM) include(TableGen) if( MINGW ) - get_system_libs(LLVM_SYSTEM_LIBS_LIST) - foreach(l ${LLVM_SYSTEM_LIBS_LIST}) - set(LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS} -l${l}") - endforeach() - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}${LLVM_SYSTEM_LIBS}") - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}${LLVM_SYSTEM_LIBS}") -endif() - -if( MINGW ) # People report that -O3 is unreliable on MinGW. The traditional # build also uses -O2 for that reason: llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 5e0e32acbc..f0dc106d3a 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -84,11 +84,9 @@ macro(add_llvm_executable name) if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) - if( NOT MINGW ) - get_system_libs(llvm_system_libs) - if( llvm_system_libs ) - target_link_libraries(${name} ${llvm_system_libs}) - endif() + get_system_libs(llvm_system_libs) + if( llvm_system_libs ) + target_link_libraries(${name} ${llvm_system_libs}) endif() endmacro(add_llvm_executable name) |