[cfe-commits] r83086 - in /cfe/trunk: lib/Driver/ToolChains.cpp test/Driver/darwin-arm.c

[Daniel Dunbar]

Author: ddunbar
Date: Tue Sep 29 13:52:10 2009
New Revision: 83086

URL: http://llvm.org/viewvc/llvm-project?rev=83086&view=rev
Log:
Fix truck sized thinko where Darwin/ARM toolchain didn't look for programs in
libexec, *blush*.

Added:
    cfe/trunk/test/Driver/darwin-arm.c
Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=83086&r1=83085&r2=83086&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Tue Sep 29 13:52:10 2009
@@ -213,6 +213,13 @@
                          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 = getHost().getDriver().Dir;
+  Path += "/../libexec";
+  getProgramPaths().push_back(Path);
+
   // We expect 'as', 'ld', etc. to be adjacent to our install dir.
   getProgramPaths().push_back(getHost().getDriver().Dir);
 }

Added: cfe/trunk/test/Driver/darwin-arm.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-arm.c?rev=83086&view=auto

==============================================================================
--- cfe/trunk/test/Driver/darwin-arm.c (added)
+++ cfe/trunk/test/Driver/darwin-arm.c Tue Sep 29 13:52:10 2009
@@ -0,0 +1,4 @@
+// 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:}}