diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-08-27 09:46:54 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-08-27 09:46:54 +0000 |
| commit | 8f4e7360807e176eaa515b7c2dbe3f31537f34e9 (patch) | |
| tree | faba12bdcd617efe54755df84440243ab07f865c /clang/lib/Driver/Tools.cpp | |
| parent | 29e3b96734846483b42cb1b50d3c399f1ccd046d (diff) | |
| download | llvm-8f4e7360807e176eaa515b7c2dbe3f31537f34e9.zip llvm-8f4e7360807e176eaa515b7c2dbe3f31537f34e9.tar.gz llvm-8f4e7360807e176eaa515b7c2dbe3f31537f34e9.tar.bz2 | |
[asan] Restore asan-rt name on linux back to pre-r216380.
There is no reason to have different library names for shared and static
cases on linux. It also breaks Android where we install the shared asan-rt
library into the system and should keep the old name.
This change reverts most of r216380 limiting it to win32 targets only.
llvm-svn: 216533
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index db1a48e..1f857e3d 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2198,8 +2198,7 @@ static void addAsanRT(const ToolChain &TC, const ArgList &Args, ArgStringList &CmdArgs, bool Shared, bool IsCXX) { if (Shared) { // Link dynamic runtime if necessary. - SmallString<128> LibSanitizer = - getSanitizerRTLibName(TC, "asan_dynamic", Shared); + SmallString<128> LibSanitizer = getSanitizerRTLibName(TC, "asan", Shared); CmdArgs.insert(CmdArgs.begin(), Args.MakeArgString(LibSanitizer)); } |