Skip to content

Conversation

@tpwrules
Copy link
Contributor

@tpwrules tpwrules commented Nov 2, 2025

Pulling on more loose threads to clean up and simplify waf. Please see commit messages for details.

Confirmed that all in-tree hwdefs for all supported boards still configure. Also confirmed no compiler output change for an arbitrary board for each of ChibiOS, ESP32, and Linux.

Environment variables are `[]` by default if mutated or specifically
checked, so existing e.g. `+=` will still work. However, a check if the
variable exists will now fail.
The merging logic is no longer necessary since we aren't re-running the
generator and merging its results multiple times per build.

Also allows ChibiOS-specific ROMFS_FILES handling to be removed as it's
now handled automatically.

No boards in tree try to redefine an existing variable.
@tpwrules
Copy link
Contributor Author

tpwrules commented Nov 2, 2025

This is another sequel to #31096 .

@tridge
Copy link
Contributor

tridge commented Nov 4, 2025

@peterbarker can you check this is no output change? if so can be merged

@peterbarker
Copy link
Contributor

@peterbarker can you check this is no output change? if so can be merged

Confirmed no compiler output change on Linux or ChibiOS boards.

@peterbarker peterbarker merged commit 3fd6f9b into ArduPilot:master Nov 4, 2025
107 of 108 checks passed
@peterbarker
Copy link
Contributor

Merged, thanks!

@tpwrules tpwrules deleted the pr/hwdef-result branch November 4, 2025 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants