From: Serge Guelton <sguelton@redhat.com>
Date: Mon, 25 Mar 2019 15:18:55 +0000 (+0000)
Subject: Revert 356905
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ee86696d74ac7955b3998bb4d5362f3ac8e3134;p=llvm

Revert 356905

Commited from wrong directory...


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@356907 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
index 25f1c28e5f0..7ef7c46a262 100644
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
@@ -268,6 +268,7 @@ int main(int argc, char **argv) {
   // tree.
   bool IsInDevelopmentTree;
   enum { CMakeStyle, CMakeBuildModeStyle } DevelopmentTreeLayout;
+  llvm::SmallString<256> CurrentPath(GetExecutablePath(argv[0]));
   std::string CurrentExecPrefix;
   std::string ActiveObjRoot;
 
@@ -278,18 +279,11 @@ int main(int argc, char **argv) {
     build_mode = CMAKE_CFG_INTDIR;
 #endif
 
-  // Create an absolute path, and pop up as much directory as in
-  // LLVM_TOOLS_INSTALL_DIR
-  {
-    llvm::SmallString<256> CurrentPath(GetExecutablePath(argv[0]));
-    sys::fs::make_absolute(CurrentPath);
-    for (auto iter = sys::path::begin(LLVM_TOOLS_INSTALL_DIR),
-              end = sys::path::end(LLVM_TOOLS_INSTALL_DIR);
-         iter != end; ++iter) {
-      CurrentPath = sys::path::parent_path(CurrentPath).str();
-    }
-    CurrentExecPrefix = sys::path::parent_path(CurrentPath).str();
-  }
+  // Create an absolute path, and pop up one directory (we expect to be inside a
+  // bin dir).
+  sys::fs::make_absolute(CurrentPath);
+  CurrentExecPrefix =
+      sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
 
   // Check to see if we are inside a development tree by comparing to possible
   // locations (prefix style or CMake style).