diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-10-06 20:44:34 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-10-06 20:44:34 +0000 |
| commit | b262556c45bb7b3add826bc3f050c99db6990c37 (patch) | |
| tree | 78000a447829d54c2c4dfdae66314a83c8d2700a /cmake | |
| parent | 5a1a1856a4dfa1335d937437fade5c0bbab06560 (diff) | |
| download | llvm-b262556c45bb7b3add826bc3f050c99db6990c37.tar.gz llvm-b262556c45bb7b3add826bc3f050c99db6990c37.tar.bz2 llvm-b262556c45bb7b3add826bc3f050c99db6990c37.tar.xz | |
Revert "Windows: Add support for unicode command lines"
This is causing MinGW bots to fail.
This reverts commit r192069.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192070 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/LLVM-Config.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/TableGen.cmake | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index dc991a23be..57725f83af 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -415,7 +415,6 @@ endif () if( MINGW ) set(HAVE_LIBIMAGEHLP 1) set(HAVE_LIBPSAPI 1) - set(HAVE_LIBSHELL32 1) # TODO: Check existence of libraries. # include(CheckLibraryExists) # CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP) diff --git a/cmake/modules/LLVM-Config.cmake b/cmake/modules/LLVM-Config.cmake index e26fabd1c6..9fa45ce966 100644 --- a/cmake/modules/LLVM-Config.cmake +++ b/cmake/modules/LLVM-Config.cmake @@ -2,7 +2,7 @@ function(get_system_libs return_var) # Returns in `return_var' a list of system libraries used by LLVM. if( NOT MSVC ) if( MINGW ) - set(system_libs ${system_libs} imagehlp psapi shell32) + set(system_libs ${system_libs} imagehlp psapi) elseif( CMAKE_HOST_UNIX ) if( HAVE_LIBRT ) set(system_libs ${system_libs} rt) diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index c17e67e478..bbd6339ac8 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -128,7 +128,7 @@ macro(add_tablegen target project) endif() if( MINGW ) - target_link_libraries(${target} imagehlp psapi shell32) + target_link_libraries(${target} imagehlp psapi) if(CMAKE_SIZEOF_VOID_P MATCHES "8") set_target_properties(${target} PROPERTIES LINK_FLAGS -Wl,--stack,16777216) endif(CMAKE_SIZEOF_VOID_P MATCHES "8") |