diff options
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 7 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/config.h.cmake | 6 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Process.inc | 9 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Signals.inc | 3 |
4 files changed, 1 insertions, 24 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index a7dc805ee27..ad9d9179067 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -434,13 +434,6 @@ else () endif () endif () -if( MINGW ) - set(HAVE_LIBPSAPI 1) - set(HAVE_LIBSHELL32 1) - # TODO: Check existence of libraries. - # include(CheckLibraryExists) -endif( MINGW ) - if( MSVC ) set(SHLIBEXT ".lib") set(stricmp "_stricmp") diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index bb378fc8b3b..c8cfb7b88c1 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/include/llvm/Config/config.h.cmake @@ -91,9 +91,6 @@ /* Define to 1 if you have the `edit' library (-ledit). */ #cmakedefine HAVE_LIBEDIT ${HAVE_LIBEDIT} -/* Define to 1 if you have the `psapi' library (-lpsapi). */ -#cmakedefine HAVE_LIBPSAPI ${HAVE_LIBPSAPI} - /* Define to 1 if you have the `pthread' library (-lpthread). */ #cmakedefine HAVE_LIBPTHREAD ${HAVE_LIBPTHREAD} @@ -103,9 +100,6 @@ /* Define to 1 if you have the `pthread_setname_np' function. */ #cmakedefine HAVE_PTHREAD_SETNAME_NP ${HAVE_PTHREAD_SETNAME_NP} -/* Define to 1 if you have the `shell32' library (-lshell32). */ -#cmakedefine HAVE_LIBSHELL32 ${HAVE_LIBSHELL32} - /* Define to 1 if you have the `z' library (-lz). */ #cmakedefine HAVE_LIBZ ${HAVE_LIBZ} diff --git a/llvm/lib/Support/Windows/Process.inc b/llvm/lib/Support/Windows/Process.inc index 3fe9f89f1ef..06b32ea90a5 100644 --- a/llvm/lib/Support/Windows/Process.inc +++ b/llvm/lib/Support/Windows/Process.inc @@ -24,14 +24,7 @@ #include <psapi.h> #include <shellapi.h> -#ifdef __MINGW32__ - #if (HAVE_LIBPSAPI != 1) - #error "libpsapi.a should be present" - #endif - #if (HAVE_LIBSHELL32 != 1) - #error "libshell32.a should be present" - #endif -#else +#if !defined(__MINGW32__) #pragma comment(lib, "psapi.lib") #pragma comment(lib, "shell32.lib") #endif diff --git a/llvm/lib/Support/Windows/Signals.inc b/llvm/lib/Support/Windows/Signals.inc index 23fc72ec10e..893d18acfde 100644 --- a/llvm/lib/Support/Windows/Signals.inc +++ b/llvm/lib/Support/Windows/Signals.inc @@ -36,9 +36,6 @@ #ifdef _MSC_VER #pragma comment(lib, "psapi.lib") #elif __MINGW32__ - #if (HAVE_LIBPSAPI != 1) - #error "libpsapi.a should be present" - #endif // The version of g++ that comes with MinGW does *not* properly understand // the ll format specifier for printf. However, MinGW passes the format // specifiers on to the MSVCRT entirely, and the CRT understands the ll |
