This is an archive of the discontinued LLVM Phabricator instance.

Differential D6040

Rename 'DarwinStaticLib' to 'DarwinLibName'
ClosedPublic

Authored by kubamracek on Oct 30 2014, 2:38 PM.

Details

Reviewers
echristo
Summary

The former name doesn't make sense, we are using this parameter for both .a and .dylib libraries.

No functional change.

Diff Detail

Event Timeline

kubamracek updated this revision to Diff 15582.Oct 30 2014, 2:38 PM
kubamracek retitled this revision from to Rename 'DarwinStaticLib' to 'DarwinLibName'.
kubamracek updated this object.
kubamracek edited the test plan for this revision. (Show Details)
kubamracek added subscribers: Unknown Object (MLST), Unknown Object (MLST), samsonov.
echristo accepted this revision.Oct 30 2014, 3:31 PM
echristo added a reviewer: echristo.
echristo added a subscriber: echristo.

Sure. LGTM.

-eric

This revision is now accepted and ready to land.Oct 30 2014, 3:31 PM
kubamracek closed this revision.Nov 5 2014, 11:21 AM

Landed in r220939.

Revision Contents

PathSize
lib/
Driver/
2 lines
4 lines

Diff 15582

lib/Driver/ToolChains.h

Context not available.
void AddLinkRuntimeLib(const llvm::opt::ArgList &Args, void AddLinkRuntimeLib(const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs, llvm::opt::ArgStringList &CmdArgs,
StringRef DarwinStaticLib, StringRef DarwinLibName,
bool AlwaysLink = false, bool AlwaysLink = false,
bool IsEmbedded = false) const; bool IsEmbedded = false) const;
Context not available.

lib/Driver/ToolChains.cpp

Context not available.
} }
void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs, void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs,
StringRef DarwinStaticLib, bool AlwaysLink, StringRef DarwinLibName, bool AlwaysLink,
bool IsEmbedded) const { bool IsEmbedded) const {
SmallString<128> P(getDriver().ResourceDir); SmallString<128> P(getDriver().ResourceDir);
llvm::sys::path::append(P, "lib", IsEmbedded ? "macho_embedded" : "darwin", llvm::sys::path::append(P, "lib", IsEmbedded ? "macho_embedded" : "darwin",
DarwinStaticLib); DarwinLibName);
// For now, allow missing resource libraries to support developers who may // For now, allow missing resource libraries to support developers who may
// not have compiler-rt checked out or integrated into their build (unless // not have compiler-rt checked out or integrated into their build (unless
Context not available.