diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-27 19:11:14 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2018-04-27 19:11:14 +0000 |
| commit | 1865df49960e34cc90d0083b0e0cd4771c0feb35 (patch) | |
| tree | e6c91dba6b86e3fc8970a42e8291771e32f82239 /clang/lib/Frontend | |
| parent | ee5be798dae30d5f9414b01f76ff807edbc881aa (diff) | |
| download | bcm5719-llvm-1865df49960e34cc90d0083b0e0cd4771c0feb35.tar.gz bcm5719-llvm-1865df49960e34cc90d0083b0e0cd4771c0feb35.zip | |
s/LLVM_ON_WIN32/_WIN32/, clang
LLVM_ON_WIN32 is set exactly with MSVC and MinGW (but not Cygwin) in
HandleLLVMOptions.cmake, which is where _WIN32 defined too. Just use the
default macro instead of a reinvented one.
See thread "Replacing LLVM_ON_WIN32 with just _WIN32" on llvm-dev and cfe-dev.
No intended behavior change.
llvm-svn: 331069
Diffstat (limited to 'clang/lib/Frontend')
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/PrecompiledPreamble.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index 0506975b027..d2fcc9a994a 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/lib/Frontend/InitHeaderSearch.cpp @@ -105,7 +105,7 @@ public: } // end anonymous namespace. static bool CanPrefixSysroot(StringRef Path) { -#if defined(LLVM_ON_WIN32) +#if defined(_WIN32) return !Path.empty() && llvm::sys::path::is_separator(Path[0]); #else return llvm::sys::path::is_absolute(Path); diff --git a/clang/lib/Frontend/PrecompiledPreamble.cpp b/clang/lib/Frontend/PrecompiledPreamble.cpp index ddd7bda546f..23371d1f426 100644 --- a/clang/lib/Frontend/PrecompiledPreamble.cpp +++ b/clang/lib/Frontend/PrecompiledPreamble.cpp @@ -40,7 +40,7 @@ namespace { StringRef getInMemoryPreamblePath() { #if defined(LLVM_ON_UNIX) return "/__clang_tmp/___clang_inmemory_preamble___"; -#elif defined(LLVM_ON_WIN32) +#elif defined(_WIN32) return "C:\\__clang_tmp\\___clang_inmemory_preamble___"; #else #warning "Unknown platform. Defaulting to UNIX-style paths for in-memory PCHs" |
