From 280ec4a46c01e26f9316a029d9099e05ee882a94 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Thu, 23 Jul 2020 17:03:34 -0400 Subject: fix(3p/nix): Link nixutil to its dependencies 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 --- third_party/nix/src/libstore/CMakeLists.txt | 5 ----- 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 bfc6b4eb59..83dd387e2a 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 53a0cb2bc4..8713d7e9b8 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 -- cgit 1.4.1