From 2735a02572d9121c2a6531a745e69f05bb2295a3 Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Fri, 31 Oct 2014 00:08:57 +0000 Subject: [PATCH] Rename 'DarwinStaticLib' to 'DarwinLibName' The former name doesn't make sense, we are using this parameter for both .a and .dylib libraries. No functional change. http://reviews.llvm.org/D6040 llvm-svn: 220939 --- clang/lib/Driver/ToolChains.cpp | 4 ++-- clang/lib/Driver/ToolChains.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index f2baff8..15e3ade 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -291,11 +291,11 @@ void DarwinClang::AddLinkARCArgs(const ArgList &Args, } void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs, - StringRef DarwinStaticLib, bool AlwaysLink, + StringRef DarwinLibName, bool AlwaysLink, bool IsEmbedded) const { SmallString<128> P(getDriver().ResourceDir); llvm::sys::path::append(P, "lib", IsEmbedded ? "macho_embedded" : "darwin", - DarwinStaticLib); + DarwinLibName); // For now, allow missing resource libraries to support developers who may // not have compiler-rt checked out or integrated into their build (unless diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h index d805958..0ff3958 100644 --- a/clang/lib/Driver/ToolChains.h +++ b/clang/lib/Driver/ToolChains.h @@ -234,7 +234,7 @@ public: void AddLinkRuntimeLib(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs, - StringRef DarwinStaticLib, + StringRef DarwinLibName, bool AlwaysLink = false, bool IsEmbedded = false) const; -- 2.7.4