diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index adf00bc0f..6b000a8ef 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -388,6 +388,7 @@ foreach(curl_arch ${curl_arches}) --disable-progress-meter --without-brotli --with-zlib=${DEPS_DESTDIR} ${curl_ssl_opts} --without-libmetalink --without-librtmp --disable-versioned-symbols --enable-hidden-symbols --without-zsh-functions-dir --without-fish-functions-dir + --without-nghttp3 --without-zstd "CC=${deps_cc}" "CFLAGS=${deps_noarch_CFLAGS}${cflags_extra}" ${curl_extra} BUILD_COMMAND true INSTALL_COMMAND ${_make} -C lib install && ${_make} -C include install diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index e2e725d74..8c0f0058b 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -1,3 +1,8 @@ +if(APPLE) + set(WITH_BOOTSTRAP OFF) +else() + option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ON) +endif() add_executable(lokinet-vpn lokinet-vpn.cpp) if(APPLE) @@ -5,8 +10,12 @@ if(APPLE) enable_lto(lokinet) else() add_executable(lokinet lokinet.cpp) - add_executable(lokinet-bootstrap lokinet-bootstrap.cpp) - enable_lto(lokinet lokinet-vpn lokinet-bootstrap) + if(WITH_BOOTSTRAP) + add_executable(lokinet-bootstrap lokinet-bootstrap.cpp) + enable_lto(lokinet lokinet-vpn lokinet-bootstrap) + else() + enable_lto(lokinet lokinet-vpn) + endif() endif() @@ -30,7 +39,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") endif() endif() -if(NOT APPLE) +if(WITH_BOOTSTRAP) target_link_libraries(lokinet-bootstrap PUBLIC cpr::cpr) if(NOT WIN32) find_package(OpenSSL REQUIRED) @@ -40,7 +49,7 @@ if(NOT APPLE) endif() set(exetargets lokinet lokinet-vpn) -if(NOT APPLE) +if(WITH_BOOTSTRAP) list(APPEND exetargets lokinet-bootstrap) endif()