diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-31 19:27:07 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-31 19:27:07 +0000 |
| commit | 667d630b0572f46ba5061276df57ed91a5b07598 (patch) | |
| tree | 065cf2c9b53ba87a38c49945ec030285831a8ca5 /clang/lib/Driver/ToolChain.cpp | |
| parent | e0b2d97b520b381f4002f1028f580defe1a31d9d (diff) | |
| download | bcm5719-llvm-667d630b0572f46ba5061276df57ed91a5b07598.tar.gz bcm5719-llvm-667d630b0572f46ba5061276df57ed91a5b07598.zip | |
Revert "Driver: use the canonical static library naming"
This breaks chromium and its unclear if this is actually a modern convention.
This reverts SVN r280169.
llvm-svn: 280281
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index b1bdfa2784e..863bd0a164b 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -288,13 +288,13 @@ std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component, bool Shared) const { const llvm::Triple &TT = getTriple(); const char *Env = TT.isAndroid() ? "-android" : ""; - bool IsWindowsIAMSVC = + bool IsITANMSVCWindows = TT.isWindowsMSVCEnvironment() || TT.isWindowsItaniumEnvironment(); StringRef Arch = getArchNameForCompilerRTLib(*this, Args); - const char *Prefix = (IsWindowsIAMSVC && Shared) ? "" : "lib"; + const char *Prefix = IsITANMSVCWindows ? "" : "lib"; const char *Suffix = Shared ? (Triple.isOSWindows() ? ".dll" : ".so") - : (IsWindowsIAMSVC ? ".lib" : ".a"); + : (IsITANMSVCWindows ? ".lib" : ".a"); SmallString<128> Path(getDriver().ResourceDir); StringRef OSLibName = Triple.isOSFreeBSD() ? "freebsd" : getOS(); |
