nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for LLVM_ON_WIN32 instead of _WIN32.

Browse Source 
This is a follow-up to r203624 to address Anton's comment.

llvm-svn: 203668
This commit is contained in:
Hans Wennborg
2014-03-12 16:07:46 +00:00
parent 3e699d419e
commit 501eadb429
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Frontend/InitHeaderSearch.cpp
View File

@@ -110,7 +110,7 @@ public:
} // end anonymous namespace.
static bool CanPrefixSysroot(StringRef Path) {
#if defined(_WIN32)
#if defined(LLVM_ON_WIN32)
return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
#else
return llvm::sys::path::is_absolute(Path);
@@ -328,7 +328,7 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
llvm::sys::path::append(P, "../../../include");
AddPath(P.str(), System, false);
AddPath("/mingw/include", System, false);
#if defined(_WIN32)
#if defined(LLVM_ON_WIN32)
AddPath("c:/mingw/include", System, false);
#endif
}
@@ -403,7 +403,7 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
AddMinGW64CXXPaths(HSOpts.ResourceDir, "4.8.1");
AddMinGW64CXXPaths(HSOpts.ResourceDir, "4.8.2");
// mingw.org C++ include paths
#if defined(_WIN32)
#if defined(LLVM_ON_WIN32)
AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.7.0");
AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.7.1");
AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.7.2");