Remove ../libexec from clang program search path, clang-cc is dead.

llvm-svn: 93749

2 files changed, 0 insertions, 28 deletions

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 42657d939a9..a05d85aa1e0 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -118,10 +118,6 @@ DarwinGCC::DarwinGCC(const HostInfo &Host, const llvm::Triple& Triple,
   Path += ToolChainDir;
   getProgramPaths().push_back(Path);
 
-  Path = getDriver().Dir;
-  Path += "/../libexec";
-  getProgramPaths().push_back(Path);
-
   getProgramPaths().push_back(getDriver().Dir);
 }
 
@@ -235,13 +231,6 @@ DarwinClang::DarwinClang(const HostInfo &Host, const llvm::Triple& Triple,
                          bool IsIPhoneOS)
   : Darwin(Host, Triple, DarwinVersion, IsIPhoneOS)
 {
-  // Add the relative libexec dir (for clang-cc).
-  //
-  // FIXME: We should sink clang-cc into libexec/clang/<version>/.
-  std::string Path = getDriver().Dir;
-  Path += "/../libexec";
-  getProgramPaths().push_back(Path);
-
   // We expect 'as', 'ld', etc. to be adjacent to our install dir.
   getProgramPaths().push_back(getDriver().Dir);
 }
@@ -544,10 +533,6 @@ const char *Darwin::GetForcedPicModel() const {
 
 Generic_GCC::Generic_GCC(const HostInfo &Host, const llvm::Triple& Triple)
   : ToolChain(Host, Triple) {
-  std::string Path(getDriver().Dir);
-  Path += "/../libexec";
-  getProgramPaths().push_back(Path);
-
   getProgramPaths().push_back(getDriver().Dir);
 }
 
@@ -684,11 +669,6 @@ Tool &FreeBSD::SelectTool(const Compilation &C, const JobAction &JA) const {
 AuroraUX::AuroraUX(const HostInfo &Host, const llvm::Triple& Triple)
   : Generic_GCC(Host, Triple) {
 
-  // Path mangling to find libexec
-  std::string Path(getDriver().Dir);
-
-  Path += "/../libexec";
-  getProgramPaths().push_back(Path);
   getProgramPaths().push_back(getDriver().Dir);
 
   getFilePaths().push_back(getDriver().Dir + "/../lib");
@@ -753,10 +733,6 @@ DragonFly::DragonFly(const HostInfo &Host, const llvm::Triple& Triple)
   : Generic_GCC(Host, Triple) {
 
   // Path mangling to find libexec
-  std::string Path(getDriver().Dir);
-
-  Path += "/../libexec";
-  getProgramPaths().push_back(Path);
   getProgramPaths().push_back(getDriver().Dir);
 
   getFilePaths().push_back(getDriver().Dir + "/../lib");
diff --git a/clang/test/Driver/darwin-arm.c b/clang/test/Driver/darwin-arm.c
deleted file mode 100644
index 330918dd47d..00000000000
--- a/clang/test/Driver/darwin-arm.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch arm -print-search-dirs | FileCheck %s
-
-// Check that we look in the relative libexec directory.
-// CHECK: {{programs: =.*/../libexec:}}