swift: Pass C base compile options to swiftc #14296
Open
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
2xsaiko
force-pushed
the
push-uxoqqoqywmwu
branch
from
c392940 to
c97b55c
Compare
4 tasks
2xsaiko
force-pushed
the
push-uxoqqoqywmwu
branch
2 times, most recently
from
c5af688 to
e79331a
Compare
dcbaker
requested changes
Feb 28, 2025
mesonbuild/compilers/swift.py
Outdated
| # Pass C compiler args to swiftc, notably -std=... | ||
| try: | ||
| c_langs = ['objc', 'c'] | ||
| c_lang = next(lang for lang in c_langs if lang in target.compilers) |
There was a problem hiding this comment.
We have a mesonlib.first() helper that I think would simplify this:
lang = mesonlib.first(target.compilers, lambda x: x in {'objc', 'c'})
if lang is not None:
cc = target.compilers[lang]
args.extend(...)with no need for a try/except block
There was a problem hiding this comment.
The order is important here though, it should generally prefer objc/c++ when available, so kept the iteration the other way around.
2xsaiko
force-pushed
the
push-uxoqqoqywmwu
branch
from
e79331a to
31441b1
Compare
dcbaker
approved these changes
Feb 28, 2025
2xsaiko
force-pushed
the
push-uxoqqoqywmwu
branch
2 times, most recently
from
a3461bb to
d5df540
Compare
2xsaiko
force-pushed
the
push-uxoqqoqywmwu
branch
from
d5df540 to
be6623a
Compare
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.
If the C/Obj-C source code needs a particular standard version, swiftc should know about it so it can parse imported headers correctly.
(This makes more sense with C++ support (commit 2xsaiko@push-nmuxysxxokuy), since setting the standard version is more common there, and was pulled out of #14261, but still applies for C as well)