llvm.org GIT mirror llvm / bdcaabb
Remove HAVE_LIBPSAPI, HAVE_SHELL32. These used to be set in the old autoconf build, but the cmake build has had a "TODO: actually check for these" comment since it was checked in, and they were set to 1 on mingw unconditionally. It seems safe to say that they always exist under mingw, so just remove them and assume they're set exactly when on mingw (with msvc, we use `pragma comment` instead of linking these via flags). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@328992 91177308-0d34-0410-b5e6-96231b3b80d8 Nico Weber 2 years ago
4 changed file(s) with 1 addition(s) and 24 deletion(s). Raw diff Collapse all Expand all
433433 endif ()
434434 endif ()
435435
436 if( MINGW )
437 set(HAVE_LIBPSAPI 1)
438 set(HAVE_LIBSHELL32 1)
439 # TODO: Check existence of libraries.
440 # include(CheckLibraryExists)
441 endif( MINGW )
442
443436 if( MSVC )
444437 set(SHLIBEXT ".lib")
445438 set(stricmp "_stricmp")
9090 /* Define to 1 if you have the `edit' library (-ledit). */
9191 #cmakedefine HAVE_LIBEDIT ${HAVE_LIBEDIT}
9292
93 /* Define to 1 if you have the `psapi' library (-lpsapi). */
94 #cmakedefine HAVE_LIBPSAPI ${HAVE_LIBPSAPI}
95
9693 /* Define to 1 if you have the `pthread' library (-lpthread). */
9794 #cmakedefine HAVE_LIBPTHREAD ${HAVE_LIBPTHREAD}
9895
10198
10299 /* Define to 1 if you have the `pthread_setname_np' function. */
103100 #cmakedefine HAVE_PTHREAD_SETNAME_NP ${HAVE_PTHREAD_SETNAME_NP}
104
105 /* Define to 1 if you have the `shell32' library (-lshell32). */
106 #cmakedefine HAVE_LIBSHELL32 ${HAVE_LIBSHELL32}
107101
108102 /* Define to 1 if you have the `z' library (-lz). */
109103 #cmakedefine HAVE_LIBZ ${HAVE_LIBZ}
2323 #include
2424 #include
2525
26 #ifdef __MINGW32__
27 #if (HAVE_LIBPSAPI != 1)
28 #error "libpsapi.a should be present"
29 #endif
30 #if (HAVE_LIBSHELL32 != 1)
31 #error "libshell32.a should be present"
32 #endif
33 #else
26 #if !defined(__MINGW32__)
3427 #pragma comment(lib, "psapi.lib")
3528 #pragma comment(lib, "shell32.lib")
3629 #endif
3535 #ifdef _MSC_VER
3636 #pragma comment(lib, "psapi.lib")
3737 #elif __MINGW32__
38 #if (HAVE_LIBPSAPI != 1)
39 #error "libpsapi.a should be present"
40 #endif
4138 // The version of g++ that comes with MinGW does *not* properly understand
4239 // the ll format specifier for printf. However, MinGW passes the format
4340 // specifiers on to the MSVCRT entirely, and the CRT understands the ll