Fix: Handle -U flags with spaces in build_flags #5301
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.
Summary
Fixes #5237
When using
-U MACRO(with space) inbuild_flags, SCons'ParseFlags()splits it into two separate items inCCFLAGS:['-U', 'MACRO']. The previous code only captured'-U'and attemptedundef[2:]which resulted in an empty string.Changes
This PR modifies the
ProcessFlagsfunction inplatformio/builder/tools/piobuild.pyto:-Uflags-Uwith the following macro name when they're separate items-UMACRO(no space) - already working ✓-U MACRO(with space) - now fixed ✓The solution follows a similar pattern to how SCons handles
-Dflags with spaces.Testing
Verified the fix handles:
-U MACROformat with space-UMACROformat without spaceExample
Before (broken):
build_flags = -U LORA_TX_POWERResult: Only
-Ucaptured, macro name lostAfter (fixed):
build_flags = -U LORA_TX_POWERResult: Correctly passes
-U LORA_TX_POWERto gcc