projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5326bb4
)
[libcxxabi] iconv is not needed for mingw-w64
author
Martell Malone
<martellmalone@gmail.com>
Fri, 26 May 2017 19:39:39 +0000
(19:39 +0000)
committer
Martell Malone
<martellmalone@gmail.com>
Fri, 26 May 2017 19:39:39 +0000
(19:39 +0000)
llvm-svn: 304026
libcxxabi/cmake/config-ix.cmake
patch
|
blob
|
history
diff --git
a/libcxxabi/cmake/config-ix.cmake
b/libcxxabi/cmake/config-ix.cmake
index
5541ed4
..
6d1c870
100644
(file)
--- a/
libcxxabi/cmake/config-ix.cmake
+++ b/
libcxxabi/cmake/config-ix.cmake
@@
-36,7
+36,7
@@
if (LIBCXXABI_HAS_NODEFAULTLIBS_FLAG)
set(MINGW_RUNTIME gcc_s gcc)
endif()
set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} moldname mingwex msvcrt advapi32
- shell32 user32 kernel32
iconv
mingw32 ${MINGW_RUNTIME}
+ shell32 user32 kernel32 mingw32 ${MINGW_RUNTIME}
moldname mingwex msvcrt)
list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
endif()