Skip to content

Commit 623b5da

Browse files
author
Oscar Fuentes
committed
Removed workaround for unspecified build problem on MinGW.
Tested that MinGW/MSYS builds fine without that. llvm-svn: 128033
1 parent f016b0a commit 623b5da

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

llvm/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,6 @@ endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
184184
include(AddLLVM)
185185
include(TableGen)
186186

187-
if( MINGW )
188-
get_system_libs(LLVM_SYSTEM_LIBS_LIST)
189-
foreach(l ${LLVM_SYSTEM_LIBS_LIST})
190-
set(LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS} -l${l}")
191-
endforeach()
192-
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}${LLVM_SYSTEM_LIBS}")
193-
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}${LLVM_SYSTEM_LIBS}")
194-
endif()
195-
196187
if( MINGW )
197188
# People report that -O3 is unreliable on MinGW. The traditional
198189
# build also uses -O2 for that reason:

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@ macro(add_llvm_executable name)
8484
if( LLVM_COMMON_DEPENDS )
8585
add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
8686
endif( LLVM_COMMON_DEPENDS )
87-
if( NOT MINGW )
88-
get_system_libs(llvm_system_libs)
89-
if( llvm_system_libs )
90-
target_link_libraries(${name} ${llvm_system_libs})
91-
endif()
87+
get_system_libs(llvm_system_libs)
88+
if( llvm_system_libs )
89+
target_link_libraries(${name} ${llvm_system_libs})
9290
endif()
9391
endmacro(add_llvm_executable name)
9492

0 commit comments

Comments
 (0)