diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-04-04 13:13:19 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-08-18 15:33:35 -0400 |
| commit | f7a33090a91015836497c75f173775392ab0304d (patch) | |
| tree | 89ff558da243a70b58ccfe7f405e9e92deaf18f5 /clang/lib/Driver/Driver.cpp | |
| parent | 8a10ee7590a91c9b2e5c80b52822a3a4c3af1a15 (diff) | |
| download | llvm-f7a33090a91015836497c75f173775392ab0304d.zip llvm-f7a33090a91015836497c75f173775392ab0304d.tar.gz llvm-f7a33090a91015836497c75f173775392ab0304d.tar.bz2 | |
[cmake] Use `CMAKE_INSTALL_LIBDIR` too
We held off on this before as `LLVM_LIBDIR_SUFFIX` conflicted with it.
Now we return this.
`LLVM_LIBDIR_SUFFIX` is kept as a deprecated way to set
`CMAKE_INSTALL_LIBDIR`. The other `*_LIBDIR_SUFFIX` are just removed
entirely.
I imagine this is too potentially-breaking to make LLVM 15. That's fine.
I have a more minimal version of this in the disto (NixOS) patches for
LLVM 15 (like previous versions). This more expansive version I will
test harder after the release is cut.
Reviewed By: sebastian-ne, ldionne, #libc, #libc_abi
Differential Revision: https://reviews.llvm.org/D130586
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 59ddc892..31cd586 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -180,7 +180,7 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath, // path of the embedding binary, which for LLVM binaries will be in bin/. // ../lib gets us to lib/ in both cases. P = llvm::sys::path::parent_path(Dir); - llvm::sys::path::append(P, Twine("lib") + CLANG_LIBDIR_SUFFIX, "clang", + llvm::sys::path::append(P, CLANG_INSTALL_LIBDIR_BASENAME, "clang", CLANG_VERSION_STRING); } |