diff options
| author | Mehdi Amini <mehdi.amini@apple.com> | 2016-11-21 21:29:59 +0000 |
|---|---|---|
| committer | Mehdi Amini <mehdi.amini@apple.com> | 2016-11-21 21:29:59 +0000 |
| commit | b08c6fdabe8b0abe2b30e25a87c01c8ef3d3391e (patch) | |
| tree | 2384ca637e8df3ee1a9df24dd052518254e204e1 | |
| parent | 1bb2fb7e96c76568ef1ffc9acf54ba5a3f030b17 (diff) | |
| download | llvm-b08c6fdabe8b0abe2b30e25a87c01c8ef3d3391e.zip llvm-b08c6fdabe8b0abe2b30e25a87c01c8ef3d3391e.tar.gz llvm-b08c6fdabe8b0abe2b30e25a87c01c8ef3d3391e.tar.bz2 | |
Merge r285525 into 3.9.1: Fix clang installed path to handle case where clang is invoked through a symlink
See https://llvm.org/PR30840
llvm-svn: 287580
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 6821add..0795b15 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -7644,7 +7644,7 @@ void darwin::Linker::AddLinkArgs(Compilation &C, const ArgList &Args, // and 'ld' will use its default mechanism to search for libLTO.dylib. if (Version[0] >= 133) { // Search for libLTO in <InstalledDir>/../lib/libLTO.dylib - StringRef P = llvm::sys::path::parent_path(D.getInstalledDir()); + StringRef P = llvm::sys::path::parent_path(D.Dir); SmallString<128> LibLTOPath(P); llvm::sys::path::append(LibLTOPath, "lib"); llvm::sys::path::append(LibLTOPath, "libLTO.dylib"); |