commit 302e2eacf6334eaf18308c4820d2e2b116adfd5d
author Daniel Dunbar <daniel@zuster.org> Wed Sep 09 22:32:41 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Wed Sep 09 22:32:41 2009 +0000
tree 180d887e4395ca0c6d3f1945becbe28938f92f2e
parent 5b750fe6189a41937ff2b080a983c95ea273769f

Use Twine concatenation instead of llvm::format.

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

lib/Driver/Tools.cpp

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 31b6cb5..9cbca9a 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1704,25 +1704,22 @@
     CmdArgs.push_back("-lgomp");
 
   // FIXME: Derive these correctly.
-  const char *TCDir = getDarwinToolChain().getToolChainDir().c_str();
+  llvm::StringRef TCDir = getDarwinToolChain().getToolChainDir();
   if (getToolChain().getArchName() == "x86_64") {
-    CmdArgs.push_back(MakeFormattedString(Args,
-                                          llvm::format("-L/usr/lib/gcc/%s/x86_64", TCDir)));
+    CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + TCDir +
+                                         "/x86_64"));
     // Intentionally duplicated for (temporary) gcc bug compatibility.
-    CmdArgs.push_back(MakeFormattedString(Args,
-                                          llvm::format("-L/usr/lib/gcc/%s/x86_64", TCDir)));
+    CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + TCDir +
+                                         "/x86_64"));
   }
-  CmdArgs.push_back(MakeFormattedString(Args,
-                                        llvm::format("-L/usr/lib/%s", TCDir)));
-  CmdArgs.push_back(MakeFormattedString(Args,
-                                        llvm::format("-L/usr/lib/gcc/%s", TCDir)));
+  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/" + TCDir));
+  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + TCDir));
   // Intentionally duplicated for (temporary) gcc bug compatibility.
-  CmdArgs.push_back(MakeFormattedString(Args,
-                                        llvm::format("-L/usr/lib/gcc/%s", TCDir)));
-  CmdArgs.push_back(MakeFormattedString(Args,
-                                        llvm::format("-L/usr/lib/gcc/%s/../../../%s", TCDir, TCDir)));
-  CmdArgs.push_back(MakeFormattedString(Args,
-                                        llvm::format("-L/usr/lib/gcc/%s/../../..", TCDir)));
+  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + TCDir));
+  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + TCDir +
+                                       "/../../../" + TCDir));
+  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + TCDir +
+                                       "/../../.."));
 
   for (InputInfoList::const_iterator
          it = Inputs.begin(), ie = Inputs.end(); it != ie; ++it) {