Install the linker where everything else is installed

esp-rs · Aug 18, 2023 · 639697e · 639697e
1 parent 3780907
commit 639697e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/build/native/cargo_driver.rs b/build/native/cargo_driver.rs
@@ -224,7 +224,9 @@ pub fn build() -> Result<EspIdfBuildOutput> {
             repo_url: Some(DEFAULT_ESP_IDF_REPOSITORY.into()),
         });
 
-        let linker_install_dir = InstallDir::try_from(None)?;
+        // Get the install dir location from the build config, or use
+        // [`crate::config::DEFAULT_TOOLS_INSTALL_DIR`] if unset.
+        let (linker_install_dir, _) = config.esp_idf_tools_install_dir()?;
 
         let installer = espidf::Installer::new(linker_origin)
             .install_dir(linker_install_dir.path().map(Into::into))