aboutsummaryrefslogtreecommitdiff
path: root/src/makefile/mod.rs
diff options
context:
space:
mode:
authorMelody Horn <melody@boringcactus.com>2024-11-10 21:20:34 -0700
committerMelody Horn <melody@boringcactus.com>2024-11-10 21:20:34 -0700
commitfca10b517b448b4023ad8c3225e59dcefd4004e4 (patch)
tree7507e959d1f690044945dd6fcf34b5fef3385b14 /src/makefile/mod.rs
parentf945ff33f9312a534ae52f1c763b4150ae41dcf6 (diff)
downloadmakers-fca10b517b448b4023ad8c3225e59dcefd4004e4.tar.gz
makers-fca10b517b448b4023ad8c3225e59dcefd4004e4.zip
overhaul eval architecture
Diffstat (limited to 'src/makefile/mod.rs')
-rw-r--r--src/makefile/mod.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs
index 62cc416..c6a8c0a 100644
--- a/src/makefile/mod.rs
+++ b/src/makefile/mod.rs
@@ -16,10 +16,12 @@ use target::{DynamicTargetSet, Target};
use token::TokenString;
use crate::args::Args;
+use crate::makefile::functions::NO_EVAL;
mod command_line;
#[cfg(feature = "full")]
mod conditional;
+mod eval_context;
#[cfg(feature = "full")]
mod functions;
mod inference_rules;
@@ -410,7 +412,9 @@ impl<'a> Makefile<'a> {
Ok(macro_pieces.join(" "))
};
- self.macros.with_lookup(&lookup_internal).expand(text)
+ self.macros
+ .with_lookup(&lookup_internal)
+ .expand(text, NO_EVAL)
}
}