From 4f29c565d6cf713aa25296e3d84e6788734692de Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Wed, 14 Apr 2021 11:59:29 -0600 Subject: add command-line arguments to MAKEFLAGS so they get inherited by recursive calls --- src/args.rs | 35 +++++++++++++++++++++++++++++++++++ src/main.rs | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/args.rs b/src/args.rs index 6def229..9318202 100644 --- a/src/args.rs +++ b/src/args.rs @@ -190,6 +190,41 @@ impl Args { .map(AsRef::as_ref) .filter(|x: &&str| x.contains('=')) } + + pub fn makeflags(&self) -> String { + let mut result = String::new(); + if self.environment_overrides { + result.push('e'); + } + if self.ignore_errors { + result.push('i'); + } + if self.keep_going { + result.push('k'); + } + if self.dry_run { + result.push('n'); + } + if self.print_everything { + result.push('p'); + } + if self.question { + result.push('q'); + } + if self.no_builtin_rules { + result.push('r'); + } + if self.no_keep_going { + result.push('S'); + } + if self.silent { + result.push('s'); + } + if self.touch { + result.push('t'); + } + result + } } #[cfg(test)] diff --git a/src/main.rs b/src/main.rs index e0deecc..f5d28b1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -60,7 +60,7 @@ fn main() -> Result<()> { args.makefile = vec![default_makefile.into()]; } // Read in the makefile(s) specified. - // TODO dump command-line args into MAKEFLAGS + env::set_var("MAKEFLAGS", args.makeflags()); // TODO dump command-line macros into environment // TODO add SHELL macro let mut makefile = Makefile::new(&args); -- cgit v1.2.3