diff --git a/rust/operator-binary/build.rs b/rust/operator-binary/build.rs index d8f91cb9..ed36fcf0 100644 --- a/rust/operator-binary/build.rs +++ b/rust/operator-binary/build.rs @@ -1,3 +1,13 @@ +use std::path::PathBuf; + fn main() { - built::write_built_file().expect("Failed to acquire build-time information"); + let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required")); + built::write_built_file_with_opts( + // built's env module depends on a whole bunch of variables that crate2nix doesn't provide + // so we grab the specific env variables that we care about out ourselves instead. + built::Options::default().set_env(false), + "Cargo.toml".as_ref(), + &out_dir.join("built.rs"), + ) + .unwrap(); } diff --git a/rust/operator-binary/src/stackable-hdfs-operator.rs b/rust/operator-binary/src/stackable-hdfs-operator.rs index b3a08c69..6c9fe1ab 100644 --- a/rust/operator-binary/src/stackable-hdfs-operator.rs +++ b/rust/operator-binary/src/stackable-hdfs-operator.rs @@ -1,4 +1,4 @@ -use clap::Parser; +use clap::{crate_description, crate_version, Parser}; use stackable_hdfs_crd::constants::APP_NAME; use stackable_hdfs_crd::HdfsCluster; use stackable_hdfs_operator::OPERATOR_NAME; @@ -10,10 +10,11 @@ use stackable_operator::{ mod built_info { // The file has been placed there by the build script. include!(concat!(env!("OUT_DIR"), "/built.rs")); + pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET"); } #[derive(clap::Parser)] -#[clap(about = built_info::PKG_DESCRIPTION, author = stackable_operator::cli::AUTHOR)] +#[clap(about, author)] struct Opts { #[clap(subcommand)] cmd: Command, @@ -36,10 +37,10 @@ async fn main() -> anyhow::Result<()> { ); stackable_operator::utils::print_startup_string( - built_info::PKG_DESCRIPTION, - built_info::PKG_VERSION, + crate_description!(), + crate_version!(), built_info::GIT_VERSION, - built_info::TARGET, + built_info::TARGET_PLATFORM.unwrap_or("unknown target"), built_info::BUILT_TIME_UTC, built_info::RUSTC_VERSION, );