Fix issues with the ar invocation

Author: troughton

lib/Driver/Driver.cpp

@@ -1959,12 +1959,10 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
   if (OI.shouldLink() && !AllLinkerInputs.empty()) {
     JobAction *LinkAction = nullptr;
 
-    if (OI.LinkAction == LinkKind::StaticLibrary) {
+    if (OI.LinkAction == LinkKind::StaticLibrary)
       LinkAction = C.createAction<ArchiveJobAction>(AllLinkerInputs,
                                                     OI.LinkAction);
-                                                  
-      llvm::errs() << "LinkAction is an ArchiveJobAction\n";
-    } else
+    else
       LinkAction = C.createAction<LinkJobAction>(AllLinkerInputs,
                                                  OI.LinkAction);
 

lib/Driver/ToolChains.cpp

@@ -1101,14 +1101,12 @@ ToolChain::constructInvocation(const ArchiveJobAction &job,
       isLLVMAR = true;
     }
 
-    // Look for binutils in the toolchain folder.
-    Arguments.push_back("-B");
-    Arguments.push_back(context.Args.MakeArgString(A->getValue()));
   }
   if (AR == nullptr) {
-    if (auto pathAR = llvm::sys::findProgramByName("llvm-ar", None))
+    if (auto pathAR = llvm::sys::findProgramByName("llvm-ar", None)) {
       AR = context.Args.MakeArgString(pathAR.get());
       isLLVMAR = true;
+    }
   }
   if (AR == nullptr) {
     if (auto pathAR = llvm::sys::findProgramByName("ar", None))