bazel build: Fix compilation bugs for Pico-W support #1797
Conversation
jaguilar
changed the title
| srcs = ["ports/freertos/sys_arch.c"], | ||
| includes = ["ports/freertos/include"], | ||
| srcs = ["contrib/ports/freertos/sys_arch.c"], | ||
| includes = ["contrib/ports/freertos/include"], | ||
| target_compatible_with = incompatible_with_config( |
There was a problem hiding this comment.
May also need hdrs = ["contrib/ports/freertos/include/arch/sys_arch.h"],
There was a problem hiding this comment.
That header is probably getting picked up by the glob pattern in pico_lwip_core, so it might work without this line.
There was a problem hiding this comment.
It wasn't working with or without, so I reverted this change for some more investigation.
Without this, we're trying to refer to a subpackage of the lwip directory called bazel/config, which doesn't exist. See similar references in this file.
|
I'm not sure how it would be best to review the various changes needed to get LWIP working. I've set up this one pull request for this one tactical change, but there are a variety of other changes needed to the bazel build files to get to a working Bazel implementation of lwip, and especially lwip with freertos. Let me know if you'd like to see all the commits in one pull request, or a separate request for each tactical change. |
|
I'm fine with either, but @kilograham is the one with the merge button. |
|
Do you happen to know the RPI people's typical preferences? They're extremely busy with the rp2350 launch right now so I'd love for this to be in the ideal condition for review whenever he gets around to it. |
This fixes two general problems. * pico_lwip_contrib_freertos misspelled several things (omitted contrib/ dir prefix, didn't have @pico-sdk in front of out references to pico-sdk targets) This is fixed simply by fixing the spellings. * Circular dependency between pico_lwip_core and pico_lwip_contrib_freertos. In NO_SYS=0 mode, lwip wants to include sys_arch.h. But sys_arch.h is defined in pico_lwip_contrib_freertos. sys_arch.c in turn wants to include lwip's opt.h and arch.h, among other things. So it needs to depend on pico_lwip_core. This is fixed by extracting all the headers into a common rule which can be depended on by both targets, then depending on it in the relevant targets. Additionally, for the LWIP+FreeRTOS build to work correctly, we need to actually depend on the pico_lwip_contrib_freertos rule from pico_lwip_core. This the purpose of the select in the deps of pico_lwip_core.
jaguilar
changed the title
|
Stick all related changes in one PR. |
jaguilar
changed the title
This fixes issues with the cyw43 driver build rules in Bazel: * Before this, the btstack would always be included even if it could not be used. If the user did not specify a btstack config, this would cause a compilation error. Now, we condition the linking and building of the btstack on whether there is a config for it. * Before, the btbus was not properly linked.
|
@armandomontanez PTAL -- this now contains all the necessary changes to build the Pigweed + Pico-W thingy I showed y'all. |
Yeah sorry, caught COVID at DEFCON |
|
Don't rush on my account. Take your time. |
Get all the rest you need. :) No urgency here. |
|
@kilograham this is ready to merge whenever you're back. |
Fixes various minor errors with the bazel build files in the pico_lwip and pico_cyw43_driver directories that were causing compilation errors.
Fixes #1796
Fixes #1798