fix: link ESP-IDF 4.4 radio archives from SDK ld

Cargo.toml

@@ -93,7 +93,7 @@ targets = [
 ]
 
 [workspace.package]
-version = "2.5.35"
+version = "2.5.36"
 edition = "2021"
 rust-version = "1.95.0"
 license = "AGPL-3.0-only"

crates/fbuild-library/src/library/esp32_framework/sdk_paths.rs

@@ -321,11 +321,19 @@ impl Esp32Framework {
         if lib_dir.exists() {
             flags.push(format!("-L{}", lib_dir.display()));
         }
+        // Arduino-ESP32 2.x keeps radio archives such as libphy.a and
+        // librtc.a beside its linker scripts. WiFi users need these archives
+        // even though the ordinary SDK libraries live under lib/.
+        let ld_dir = sdk_dir.join("ld");
+        if ld_dir.exists() {
+            flags.push(format!("-L{}", ld_dir.display()));
+        }
         let mut libraries = variant_dir
             .as_ref()
             .map(|dir| collect_archive_files(dir))
             .unwrap_or_default();
         libraries.extend(collect_archive_files(&lib_dir));
+        libraries.extend(collect_archive_files(&ld_dir));
         let mut names = std::collections::BTreeSet::new();
         for lib in libraries {
             if let Some(stem) = lib.file_stem() {

crates/fbuild-library/src/library/esp32_framework/tests.rs

@@ -417,6 +417,35 @@ fn old_sdk_libraries_use_selected_variant_before_common_archives() {
     assert!(flags.contains(&"-lesp_system".to_string()));
 }
 
+#[test]
+fn old_sdk_radio_archives_are_linked_from_ld_directory() {
+    let tmp = tempfile::TempDir::new().unwrap();
+    let sdk = tmp.path().join("tools").join("sdk").join("esp32");
+    let common = sdk.join("lib");
+    let ld = sdk.join("ld");
+    std::fs::create_dir_all(&common).unwrap();
+    std::fs::create_dir_all(&ld).unwrap();
+    std::fs::write(common.join("libesp_phy.a"), "").unwrap();
+    std::fs::write(ld.join("libphy.a"), "").unwrap();
+    std::fs::write(ld.join("librtc.a"), "").unwrap();
+    let fw = Esp32Framework {
+        base: PackageBase::new(
+            "test",
+            "1.0",
+            "http://example.com",
+            "http://example.com",
+            None,
+            CacheSubdir::Platforms,
+            tmp.path(),
+        ),
+        install_dir: Some(tmp.path().to_path_buf()),
+    };
+    let flags = fw.get_sdk_lib_flags("esp32", None);
+    assert!(flags.contains(&format!("-L{}", ld.display())));
+    assert!(flags.contains(&"-lphy".to_string()));
+    assert!(flags.contains(&"-lrtc".to_string()));
+}
+
 #[test]
 fn test_split_defines_preserves_escaped_quotes() {
     let content =

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fbuild"
-version = "2.5.35"
+version = "2.5.36"
 description = "PlatformIO-compatible embedded build tool (Rust implementation)"
 readme = "README.md"
 license = "AGPL-3.0-only"