diff options
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 2d95aec080..a8a88e70b1 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1109,11 +1109,13 @@ static void addAsanRTLinux(const ToolChain &TC, const ArgList &Args, !Args.hasFlag(options::OPT_faddress_sanitizer, options::OPT_fno_address_sanitizer, false)) return; - // LibAsan is "../lib/clang/linux/ArchName/libclang_rt.asan.a" - llvm::SmallString<128> LibAsan = - llvm::sys::path::parent_path(StringRef(TC.getDriver().Dir)); - llvm::sys::path::append(LibAsan, "lib", "clang", "linux", TC.getArchName()); - llvm::sys::path::append(LibAsan, "libclang_rt.asan.a"); + + // LibAsan is "libclang_rt.asan-<ArchName>.a" in the Linux library resource + // directory. + llvm::SmallString<128> LibAsan(TC.getDriver().ResourceDir); + llvm::sys::path::append(LibAsan, "lib", "linux", + (Twine("libclang_rt.asan-") + + TC.getArchName() + ".a")); CmdArgs.push_back(Args.MakeArgString(LibAsan)); CmdArgs.push_back("-lpthread"); CmdArgs.push_back("-ldl"); |