diff --git a/xtask/src/main.rs b/xtask/src/main.rs index dfe6308c4..970a80ccc 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -876,12 +876,15 @@ fn build_hw_image( pkg_path.push(pkg); init.push(pkg_path); } + // stash any LTO settings applied to the kernel; proper layout of the loader + // block depends on the loader being compact and highly optimized. let existing_lto = std::env::var("CARGO_PROFILE_RELEASE_LTO") .map(|v| Some(v)) .unwrap_or(None); let existing_codegen_units = std::env::var("CARGO_PROFILE_RELEASE_CODEGEN_UNITS") .map(|v| Some(v)) .unwrap_or(None); + // these settings will generate the most compact code (but also the hardest to debug) std::env::set_var("CARGO_PROFILE_RELEASE_LTO", "true"); std::env::set_var("CARGO_PROFILE_RELEASE_CODEGEN_UNITS", "1"); let mut loader = build( @@ -892,6 +895,7 @@ fn build_hw_image( None, loader_features, )?; + // restore the LTO settings if let Some(existing) = existing_lto { std::env::set_var("CARGO_PROFILE_RELEASE_LTO", existing); }