Skip to content

Commit 05abf16

Browse files
authored
Disable LTO and update changelog (#6777)
1 parent 5d362d1 commit 05abf16

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ and this project adheres Fto [Semantic Versioning](http://semver.org/spec/v2.0.0
1313

1414
- Joining nodes can now request a snapshot from their peers at startup, rather than relying on file access. The joinee's snapshot will be fetched and used if it is more recent than the joiner has access to. This behaviour is enabled by default, but can be disabled via the `command.join.fetch_recent_snapshot` config option (#6758).
1515

16+
### Changed
17+
18+
- CCF now defaults to using libstdc++ rather than libc++, and no longer builds with LTO, to improve compatibility with other C++ libraries.
19+
1620
## [6.0.0-dev12]
1721

1822
[6.0.0-dev12]: https://github.com/microsoft/CCF/releases/tag/6.0.0-dev12

cmake/preproject.cmake

-9
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,4 @@ if("${COMPILE_TARGET}" STREQUAL "snp")
8282
endif()
8383
endif()
8484

85-
if("${COMPILE_TARGET}" STREQUAL "snp" OR "${COMPILE_TARGET}" STREQUAL "virtual")
86-
if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" AND NOT TSAN)
87-
add_compile_options(-flto)
88-
endif()
89-
# Unconditionally make linker aware of possible LTO happening. Otherwise
90-
# targets built in Debug and linked against this will fail linkage.
91-
add_link_options(-flto)
92-
endif()
93-
9485
set(CMAKE_CXX_STANDARD 20)

0 commit comments

Comments
 (0)