r276606 - [MSVCToolChain] Guard hardcoded Windows paths with LLVM_ON_WIN32

David Majnemer via cfe-commits cfe-commits at lists.llvm.org
Sun Jul 24 21:47:44 PDT 2016


Author: majnemer
Date: Sun Jul 24 23:47:44 2016
New Revision: 276606

URL: http://llvm.org/viewvc/llvm-project?rev=276606&view=rev
Log:
[MSVCToolChain] Guard hardcoded Windows paths with LLVM_ON_WIN32

Paths like C:/foo will never work on UNIX platforms, don't bother
implicitly adding them to the search path.

Modified:
    cfe/trunk/lib/Driver/MSVCToolChain.cpp

Modified: cfe/trunk/lib/Driver/MSVCToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MSVCToolChain.cpp?rev=276606&r1=276605&r2=276606&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/MSVCToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/MSVCToolChain.cpp Sun Jul 24 23:47:44 2016
@@ -648,6 +648,7 @@ void MSVCToolChain::AddClangSystemInclud
     return;
   }
 
+#if defined(LLVM_ON_WIN32)
   // As a fallback, select default install paths.
   // FIXME: Don't guess drives and paths like this on Windows.
   const StringRef Paths[] = {
@@ -658,6 +659,7 @@ void MSVCToolChain::AddClangSystemInclud
     "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK/Include"
   };
   addSystemIncludes(DriverArgs, CC1Args, Paths);
+#endif
 }
 
 void MSVCToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,




More information about the cfe-commits mailing list