Skip to content

fix(rp2040): scope framework library includes #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zackees merged 1 commit into from
Aug 5, 2026
Merged

fix(rp2040): scope framework library includes #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ exclude = [
libraries = [{ path = "dylints/*" }]

[workspace.package]
version = "2.5.8"
version = "2.5.9"
edition = "2021"
rust-version = "1.94.1"
license = "MIT OR Apache-2.0"
Expand Down
20 changes: 11 additions & 9 deletions crates/fbuild-build-arm/src/rp2040/orchestrator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use crate::build_fingerprint::{
use crate::compile_database::TargetArchitecture;
use crate::compiler::Compiler as _;
use crate::framework_libs::{
library_select_kv_store, resolve_framework_library_sources_active_declared,
resolve_framework_library_sources_cached, warn_if_lib_ldf_mode_unsupported,
library_select_kv_store, resolve_framework_library_selection_active_declared,
resolve_framework_library_selection_cached, warn_if_lib_ldf_mode_unsupported,
};
use crate::generic_arm::{ArmCompiler, ArmLinker};
use crate::pipeline;
Expand Down Expand Up @@ -240,7 +240,7 @@ impl BuildOrchestrator for Rp2040Orchestrator {
.flatten()
.as_deref(),
);
let framework_library_sources = match library_select_kv_store() {
let framework_library_selection = match library_select_kv_store() {
Some(store) => {
let key_inputs = fbuild_library_select::cache::CacheKeyInputs {
toolchain_triple: "rp2040-arm-none-eabi",
Expand All @@ -249,28 +249,30 @@ impl BuildOrchestrator for Rp2040Orchestrator {
preprocessor_defines: &defines,
declared_deps: &declared_deps,
};
resolve_framework_library_sources_cached(
resolve_framework_library_selection_cached(
&framework_libs,
&params.project_dir,
&ctx.src_dir,
&key_inputs,
store,
)
}
None => resolve_framework_library_sources_active_declared(
None => resolve_framework_library_selection_active_declared(
&framework_libs,
&params.project_dir,
&ctx.src_dir,
&defines,
&declared_deps,
),
};
if !framework_library_sources.is_empty() {
if !framework_library_selection.source_files.is_empty() {
tracing::info!(
"RP2040 framework library sources added: {}",
framework_library_sources.len()
framework_library_selection.source_files.len()
);
sources.core_sources.extend(framework_library_sources);
sources
.core_sources
.extend(framework_library_selection.source_files.clone());
}
// Use the resolved core_dir/variant_dir instead of board.get_include_paths():
// RP2040 board metadata reports `core = earlephilhower`, while the actual
Expand All @@ -285,7 +287,7 @@ impl BuildOrchestrator for Rp2040Orchestrator {
add_rp_family_includes(&framework_include, &ctx.board.mcu, &mut include_dirs);
}
add_rp_board_includes(&board_props, &framework_dir, &mut include_dirs);
include_dirs.extend(framework.get_framework_library_include_dirs());
include_dirs.extend(framework_library_selection.include_dirs);
include_dirs.push(ctx.src_dir.clone());
pipeline::discover_project_includes(&params.project_dir, &mut include_dirs);
// Toolchain sysroot includes
Expand Down
Loading
Loading