Update CMakeLists.txt #734
Merged
+1,653
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Handle platforms that have `_GLIBCXX_ASSERTIONS`, which require the stdlib++ to be included.
|
@jcelerier does this fix one of the two Arch Linux errors you reported? |
jcelerier
reviewed
Jan 22, 2025
CMakeLists.txt
Outdated
| @@ -95,6 +95,15 @@ if (NOT MSVC AND NOT (SNMALLOC_CLEANUP STREQUAL CXX11_DESTRUCTORS)) | |||
| endif() | |||
| endif() | |||
|
|
|||
| # FORTIFY_SOURCE prevents overriding memcpy, disable memcpy if detected. | |||
| if("${CMAKE_CXX_FLAGS}" MATCHES ".*_FORTIFY_SOURCE.*") | |||
There was a problem hiding this comment.
I think a safer way to try this would be to use a cmake try_compile test, as there are other ways for flags to end up in -DCMAKE_CXX_FLAGS than this:
- CMAKE_CXX_FLAGS_
- a host project adding the flag via
add_compile_optionsoradd_compile_definitionsand then doing add_subdirectory(snmalloc)
There was a problem hiding this comment.
example:
cmake_minimum_required(VERSION 3.31)
project(foo LANGUAGES CXX)
try_compile(no_macro
SOURCE_FROM_CONTENT main.cpp
[=[
#if defined(_FORTIFY_SOURCE)
#error
#endif
int main() { }
]=]
)
message("Result: ${no_macro}")
``̀`There was a problem hiding this comment.
That's a great suggestion, I have done something similar to your suggestion.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Handle platforms that have
_GLIBCXX_ASSERTIONS, which require the stdlib++ to be included.