commit 17381a06273637ef77efda0c8351655c7ea40d7a
author Benjamin Kramer <benny.kra@googlemail.com> Fri Jun 28 16:25:46 2013 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Fri Jun 28 16:25:46 2013 +0000
tree 1c1d1c2151fc1cbdb8495a51ffa1d1d83b278804
parent 13f89cd19b5425e2671390ef971f00b51f6bb113

Use the multiple argument form of path::append.

llvm-svn: 185164

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 47a5f33..854a6f4 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -222,9 +222,7 @@
   SmallString<128> P(getDriver().ClangExecutable);
   llvm::sys::path::remove_filename(P); // 'clang'
   llvm::sys::path::remove_filename(P); // 'bin'
-  llvm::sys::path::append(P, "lib");
-  llvm::sys::path::append(P, "arc");
-  llvm::sys::path::append(P, "libarclite_");
+  llvm::sys::path::append(P, "lib", "arc", "libarclite_");
   // Mash in the platform.
   if (isTargetIOSSimulator())
     P += "iphonesimulator";
@@ -242,9 +240,7 @@
                                     const char *DarwinStaticLib,
                                     bool AlwaysLink) const {
   SmallString<128> P(getDriver().ResourceDir);
-  llvm::sys::path::append(P, "lib");
-  llvm::sys::path::append(P, "darwin");
-  llvm::sys::path::append(P, DarwinStaticLib);
+  llvm::sys::path::append(P, "lib", "darwin", DarwinStaticLib);
 
   // For now, allow missing resource libraries to support developers who may
   // not have compiler-rt checked out or integrated into their build (unless
@@ -539,9 +535,7 @@
     // Check in the sysroot first.
     if (const Arg *A = Args.getLastArg(options::OPT_isysroot)) {
       SmallString<128> P(A->getValue());
-      llvm::sys::path::append(P, "usr");
-      llvm::sys::path::append(P, "lib");
-      llvm::sys::path::append(P, "libstdc++.dylib");
+      llvm::sys::path::append(P, "usr", "lib", "libstdc++.dylib");
 
       if (!llvm::sys::fs::exists(P.str())) {
         llvm::sys::path::remove_filename(P);
@@ -577,8 +571,7 @@
   // only present in the gcc lib dir, which makes it hard to find).
 
   SmallString<128> P(getDriver().ResourceDir);
-  llvm::sys::path::append(P, "lib");
-  llvm::sys::path::append(P, "darwin");
+  llvm::sys::path::append(P, "lib", "darwin");
 
   // Use the newer cc_kext for iOS ARM after 6.0.
   if (!isTargetIPhoneOS() || isTargetIOSSimulator() ||