Author: mehdi_amini Date: Mon Nov 21 15:29:59 2016 New Revision: 287580 URL: http://llvm.org/viewvc/llvm-project?rev=287580&view=rev Log: 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 Modified: cfe/branches/release_39/lib/Driver/Tools.cpp Modified: cfe/branches/release_39/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/lib/Driver/Tools.cpp?rev=287580&r1=287579&r2=287580&view=diff ============================================================================== --- cfe/branches/release_39/lib/Driver/Tools.cpp (original) +++ cfe/branches/release_39/lib/Driver/Tools.cpp Mon Nov 21 15:29:59 2016 @@ -7644,7 +7644,7 @@ void darwin::Linker::AddLinkArgs(Compila // 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"); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
