From: Kuba Brecka Date: Fri, 31 Oct 2014 00:08:57 +0000 (+0000) Subject: Rename 'DarwinStaticLib' to 'DarwinLibName' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87ea7dcc9118922a2940269a8c0057300e0b9129;p=clang 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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@220939 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index f2baff8265..15e3ade0a1 100644 --- a/lib/Driver/ToolChains.cpp +++ b/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/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index d805958356..0ff3958013 100644 --- a/lib/Driver/ToolChains.h +++ b/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;