CMake: Define DARWIN_LIBMALLOC #78963
Merged
Conversation
This file contains hidden or 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
`SWIFT_STDLIB_HAS_MALLOC_TYPE` is defined in terms of `SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC` in `include/swift/Runtime/Config.h`. Apple platforms generally have the Darwin libmalloc, so it should be a safe bet to define it this way. Unfortunately, a lot of things include the Config.h file, transitively or otherwise, so figuring out exactly which libraries should have this defined vs ones that should not is rather tricky, so for now, I've defined it globally.
etcwilde
requested review from
compnerd,
edymtt and
justice-adams-apple
as code owners
|
@swift-ci please smoke test |
compnerd
reviewed
Jan 28, 2025
| @@ -135,6 +135,7 @@ add_compile_definitions( | |||
| $<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA> # Stubs | |||
| $<$<BOOL:${SwiftCore_ENABLE_ENVIRONMENT}>:-DSWIFT_STDLIB_HAS_ENVIRON> # Concurrency, runtime, shims, platform overlay | |||
| $<$<BOOL:${SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT}>:-DSWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT> # Concurrency, Compatibility override, magic symbols | |||
| $<$<BOOL:${SwiftCore_HAS_DARWIN_LIBMALLOC}>:-DSWIFT_STDLIB_HAS_DARWIN_LIBMALLOC> # Anything that includes include/swift/Runtime/Config.h | |||
There was a problem hiding this comment.
Can we not make this an interface property for anything that has the include path for Config.h?
There was a problem hiding this comment.
I'm not sure how you propose doing that? We aren't tracking the includes of that file in CMake...
If you have a solution, I'm happy to change it though.
justice-adams-apple
approved these changes
Jan 28, 2025
compnerd
approved these changes
Jan 28, 2025
|
@swift-ci please smoke test macOS |
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.
SWIFT_STDLIB_HAS_MALLOC_TYPEis defined in terms ofSWIFT_STDLIB_HAS_DARWIN_LIBMALLOCininclude/swift/Runtime/Config.h. Apple platforms generally have the Darwin libmalloc, so it should be a safe bet to define it this way. Unfortunately, a lot of things include the Config.h file, transitively or otherwise, so figuring out exactly which libraries should have this defined vs ones that should not is rather tricky, so for now, I've defined it globally.rdar://143697425