r253899 - Fix alignment of r253898

Martell Malone via cfe-commits cfe-commits at lists.llvm.org
Mon Nov 23 11:05:20 PST 2015


Author: martell
Date: Mon Nov 23 13:05:19 2015
New Revision: 253899

URL: http://llvm.org/viewvc/llvm-project?rev=253899&view=rev
Log:
Fix alignment of r253898

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

Modified: cfe/trunk/lib/Driver/MinGWToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MinGWToolChain.cpp?rev=253899&r1=253898&r2=253899&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/MinGWToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/MinGWToolChain.cpp Mon Nov 23 13:05:19 2015
@@ -66,19 +66,17 @@ MinGW::MinGW(const Driver &D, const llvm
     : ToolChain(D, Triple, Args) {
   getProgramPaths().push_back(getDriver().getInstalledDir());
 
-// On Windows if there is no sysroot we search for gcc on the PATH.
-
-if (getDriver().SysRoot.size())
+  // On Windows if there is no sysroot we search for gcc on the PATH.
+  if (getDriver().SysRoot.size())
   Base = getDriver().SysRoot;
 #ifdef LLVM_ON_WIN32
-else if (llvm::ErrorOr<std::string> GPPName =
-             llvm::sys::findProgramByName("gcc"))
-  Base = llvm::sys::path::parent_path(
-      llvm::sys::path::parent_path(GPPName.get()));
+  else if (llvm::ErrorOr<std::string> GPPName =
+               llvm::sys::findProgramByName("gcc"))
+    Base = llvm::sys::path::parent_path(
+        llvm::sys::path::parent_path(GPPName.get()));
 #endif
-
-if (!Base.size())
-  Base = llvm::sys::path::parent_path(getDriver().getInstalledDir());
+  if (!Base.size())
+    Base = llvm::sys::path::parent_path(getDriver().getInstalledDir());
 
   Base += llvm::sys::path::get_separator();
   findGccLibDir();




More information about the cfe-commits mailing list