diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-07-23T21·03-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-07-24T00·56+0000 |
| commit | 280ec4a46c01e26f9316a029d9099e05ee882a94 (patch) | |
| tree | b7b363ab1ff2f09849e6583874b2b7599654cd2d /third_party | |
| parent | 6bdd191cbf440506abc0440bba732dc41ee4996f (diff) | |
fix(3p/nix): Link nixutil to its dependencies r/1447
nixutil depends on bzip2, lzma, boost::context, brotli{enc,dec}, and
openssl, but wasn't directly linking to them. This was causing linker
errors in a test that only depended on nixutil.
Change-Id: I60e77ea7b18b08e2946fcf9176ae0f355cd71844
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1384
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/nix/src/libstore/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/third_party/nix/src/libstore/CMakeLists.txt b/third_party/nix/src/libstore/CMakeLists.txt index bfc6b4eb5947..83dd387e2af0 100644 --- a/third_party/nix/src/libstore/CMakeLists.txt +++ b/third_party/nix/src/libstore/CMakeLists.txt @@ -91,14 +91,9 @@ target_link_libraries(nixstore nixproto nixutil - BZip2::BZip2 - Boost::context CURL::libcurl - LibLZMA::LibLZMA SQLite::SQLite3 absl::strings - brotlidec - brotlienc glog seccomp sodium diff --git a/third_party/nix/src/libutil/CMakeLists.txt b/third_party/nix/src/libutil/CMakeLists.txt index 53a0cb2bc45c..8713d7e9b86d 100644 --- a/third_party/nix/src/libutil/CMakeLists.txt +++ b/third_party/nix/src/libutil/CMakeLists.txt @@ -49,6 +49,12 @@ target_sources(nixutil target_link_libraries(nixutil absl::strings glog + BZip2::BZip2 + LibLZMA::LibLZMA + Boost::context + brotlienc + brotlidec + ssl ) # Install header files to include/libutil and mark them for automatic |