Fixup after rebase

CMakeLists.txt

@@ -370,8 +370,9 @@ if(USE_LIBABYSS)
   endif(NOT WIN32)
 
   target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} Threads::Threads)
-  target_include_directories(${ABYSS_EXE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
+  target_include_directories(${UTIL_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
   target_include_directories(${ABYSS_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
+  target_include_directories(${ABYSS_EXE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
 
   # for freebsd
   if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")

llarp/CMakeLists.txt

@@ -31,7 +31,7 @@ set(LIB_UTIL_SRC
 
 add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
 target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${UTIL_LIB} PUBLIC cppbackport)
+target_link_libraries(${UTIL_LIB} PUBLIC cppbackport absl::variant)
 
 # cut back on fluff
 if (NOT WIN32)
@@ -76,6 +76,7 @@ if(WIN32)
 endif()
 
 if(USE_LIBABYSS)
+    target_link_libraries(${UTIL_LIB} PUBLIC ${ABYSS_LIB})
     target_link_libraries(${PLATFORM_LIB} ${ABYSS_LIB})
 endif()