diff options
| author | Melody Horn <melody@boringcactus.com> | 2021-04-06 18:29:50 -0600 |
|---|---|---|
| committer | Melody Horn <melody@boringcactus.com> | 2021-04-06 18:29:50 -0600 |
| commit | 6dbb6548990841e7aeb991b76a58e14d237e79d0 (patch) | |
| tree | 5088e96003390ca954a3a7de3ef559d415b0ace0 /src/makefile/input.rs | |
| parent | cffe08ca6db316f48eafb49b914ecd192aa8c45f (diff) | |
| download | makers-6dbb6548990841e7aeb991b76a58e14d237e79d0.tar.gz makers-6dbb6548990841e7aeb991b76a58e14d237e79d0.zip | |
fix exports oops
Diffstat (limited to 'src/makefile/input.rs')
| -rw-r--r-- | src/makefile/input.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/makefile/input.rs b/src/makefile/input.rs index 2f8de49..1757222 100644 --- a/src/makefile/input.rs +++ b/src/makefile/input.rs @@ -703,6 +703,7 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> { FinishedMakefileReader { inference_rules: self.inference_rules, macros: self.macros.data, + macro_exports: self.macros.exported, targets: self.targets, first_non_special_target: self.first_non_special_target, failed_includes: self.failed_includes, @@ -711,7 +712,7 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> { fn extend(&mut self, new: FinishedMakefileReader) { self.inference_rules.extend(new.inference_rules); - self.macros.extend(new.macros); + self.macros.extend(new.macros, new.macro_exports); self.targets.extend(new.targets); if self.first_non_special_target.is_none() { self.first_non_special_target = new.first_non_special_target; @@ -723,6 +724,7 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> { pub struct FinishedMakefileReader { pub inference_rules: Vec<InferenceRule>, pub macros: HashMap<String, Macro>, + pub macro_exports: ExportConfig, pub targets: HashMap<String, Target>, pub first_non_special_target: Option<String>, pub failed_includes: Vec<String>, |