diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-02 17:32:48 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2018-04-02 17:32:48 +0000 |
| commit | 868112181b596ec4f310dc4442e93379d0217bdd (patch) | |
| tree | 8eaf7504e2e448b4b4f1a094397b7c991629c190 /llvm/lib/Support/Windows | |
| parent | 5a8d4c3357c9c7910ef2a39ea10d66c0a24f327d (diff) | |
| download | bcm5719-llvm-868112181b596ec4f310dc4442e93379d0217bdd.tar.gz bcm5719-llvm-868112181b596ec4f310dc4442e93379d0217bdd.zip | |
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).
llvm-svn: 328992
Diffstat (limited to 'llvm/lib/Support/Windows')
| -rw-r--r-- | llvm/lib/Support/Windows/Process.inc | 9 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Signals.inc | 3 |
2 files changed, 1 insertions, 11 deletions
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 |
