From 8aef5d742d30634a5802347088d4051eda9af6c8 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Thu, 2 Sep 2021 19:07:40 -0300 Subject: [PATCH] Re-enable LTO; target macos 10.12+ --- CMakeLists.txt | 2 +- contrib/mac.sh | 2 +- daemon/CMakeLists.txt | 1 + llarp/apple/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1bf223fa..6b23ebe10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10) # bionic's cmake version set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Has to be set before `project()`, and ignored on non-macos: -set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "macOS deployment target (Apple clang only)") +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)") set(LANGS C CXX) if(APPLE) diff --git a/contrib/mac.sh b/contrib/mac.sh index 548c9f8b2..4719b40d2 100755 --- a/contrib/mac.sh +++ b/contrib/mac.sh @@ -28,7 +28,7 @@ cmake \ -DWITH_SYSTEMD=OFF \ -DFORCE_OXENMQ_SUBMODULE=ON \ -DSUBMODULE_CHECK=OFF \ - -DWITH_LTO=OFF \ + -DWITH_LTO=ON \ -DCMAKE_BUILD_TYPE=Release \ "$@" \ .. diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index febc7314a..deb60ed0f 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -5,6 +5,7 @@ if(APPLE) add_executable(lokinet ${LOKINET_SWIFT_SOURCES}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Lokinet.modulemap.in ${CMAKE_CURRENT_BINARY_DIR}/swift/LokinetExtension/module.modulemap ESCAPE_QUOTES @ONLY) target_include_directories(lokinet PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/swift) + enable_lto(lokinet) else() add_executable(lokinet lokinet.cpp) add_executable(lokinet-bootstrap lokinet-bootstrap.cpp) diff --git a/llarp/apple/CMakeLists.txt b/llarp/apple/CMakeLists.txt index a2799167e..58a54727a 100644 --- a/llarp/apple/CMakeLists.txt +++ b/llarp/apple/CMakeLists.txt @@ -21,6 +21,7 @@ add_executable(lokinet-extension MACOSX_BUNDLE PacketTunnelProvider.m DNSTrampoline.m ) +enable_lto(lokinet-extension) target_link_libraries(lokinet-extension PRIVATE liblokinet ${COREFOUNDATION}