Scons quality-of-life improvements #4234
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
…t passed as scons vars so that we don't have to write "USE_FOO=$(USE_FOO)" 20 times every time we add such flag
cepetr
approved these changes
Oct 2, 2024
core/SConscript.unix
Outdated
| @@ -835,7 +841,9 @@ def cargo_build(): | |||
| bindgen_macros = tools.get_bindgen_defines(env.get("CPPDEFINES"), ALLPATHS) | |||
| build_dir = str(Dir('.').abspath) | |||
|
|
|||
| return f'export BINDGEN_MACROS=\'{bindgen_macros}\'; export BUILD_DIR=\'{build_dir}\'; cd embed/rust; cargo build --profile {RUST_PROFILE} --target-dir=../../build/unix/rust --no-default-features --features "{" ".join(features)}" --target {TARGET}' | |||
| print(bindgen_macros) | |||
There was a problem hiding this comment.
Do we need to leave these print() statements here?
There was a problem hiding this comment.
fixed in force-push
Here we change all FOO=VALUE defines to be tuples ("FOO", "VALUE").
Also, VALUE is always the raw string you want to end up in the C file,
instead of attempting to shell-escape it while specifying.
By all rights scons _should_ be using shlex.quote() on the CPPDEFINES,
but it doesn't, so we hack it by specifying the define prefix as `-D'`
and suffix as `'`. That way the arguments in shell are '-escaped, and
we're (currently) not using ' in any argument value so this should work
fine.
At the same time, when passing the flags to cargo, we can shlex.quote
the whole thing and get the right strings passed all the way into
build.rs -- as long as no argument contains a comma, which is the split
character...
[no changelog]
matejcik
force-pushed
the
matejcik/scons-vars
branch
from
9e9ea7c
to
f765e11
Compare
|
cherry-picked your quiet mode as f765e11 |
This was referenced Oct 9, 2024
Merged
|
blocked by #4253 that causes build failures in CI we could work around it here by not passing PYOPT to kernel, or force-setting it to 1, but i'd prefer a real solution |
matejcik
added
the
blocked
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.
$(SCONS)in makefile now includes all the TREZOR_FOO_BAR=1 specifiers so you don't have to copy them to 20 places when adding a new oneCPPDEFINESin Sconscripts no longer need to be shell-quoted ... (but it's still a hack, read the commit description to learn more about limitations)