From 89d1d71ec9b6f12206f51ab790f4fff8a5ab8d07 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 8 Feb 2026 19:12:30 +0100 Subject: [PATCH] Improve the default of FIRMWARE_DEVEL again, fix brew install gcc command --- doc/installing-from-source.md | 2 +- installer/build.rs | 9 ++++++++- scripts/install-dev.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/installing-from-source.md b/doc/installing-from-source.md index 5040b22..c67865b 100644 --- a/doc/installing-from-source.md +++ b/doc/installing-from-source.md @@ -18,7 +18,7 @@ First, install dependencies: - [Rust](https://www.rust-lang.org/tools/install) - [Node.js/npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) -- C compiler tools (`apt install build-essential` or `brew install gcc`) +- C compiler tools (`apt install build-essential` on Linux, `xcode-select --install` on Mac) Then you can build everything with: diff --git a/installer/build.rs b/installer/build.rs index ea46da8..8b2e41b 100644 --- a/installer/build.rs +++ b/installer/build.rs @@ -4,7 +4,14 @@ use std::process::exit; fn main() { println!("cargo::rerun-if-env-changed=NO_FIRMWARE_BIN"); println!("cargo::rerun-if-env-changed=FIRMWARE_PROFILE"); - let profile = std::env::var("FIRMWARE_PROFILE").unwrap_or_else(|_| "firmware".to_string()); + let profile = std::env::var("FIRMWARE_PROFILE").unwrap_or_else(|_| { + // Default to firmware-devel for debug builds, firmware for release builds + if std::env::var("PROFILE").as_deref() == Ok("release") { + "firmware".to_string() + } else { + "firmware-devel".to_string() + } + }); let include_dir = Path::new(env!("CARGO_MANIFEST_DIR")) .join("../target/armv7-unknown-linux-musleabihf") .join(&profile); diff --git a/scripts/install-dev.sh b/scripts/install-dev.sh index 2d32023..c979a02 100755 --- a/scripts/install-dev.sh +++ b/scripts/install-dev.sh @@ -11,4 +11,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_DIR="$(dirname "$SCRIPT_DIR")" cd "$PROJECT_DIR" -FIRMWARE_PROFILE=firmware-devel cargo run -p installer --bin installer -- "$@" +cargo run -p installer --bin installer -- "$@"