aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelody Horn <melody@boringcactus.com>2021-04-06 16:32:45 -0600
committerMelody Horn <melody@boringcactus.com>2021-04-06 16:32:45 -0600
commit7f3f397015e0b417ef6a35fec819ec1d3761d5b8 (patch)
treec4c8d2d0825515a1fc7c6bad1205a47968ec9255
parent0b4bdb6dae6dbb3d37695555765acabbf2663849 (diff)
downloadmakers-7f3f397015e0b417ef6a35fec819ec1d3761d5b8.tar.gz
makers-7f3f397015e0b417ef6a35fec819ec1d3761d5b8.zip
clean up suffix rule ignoring info
-rw-r--r--src/makefile/input.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/makefile/input.rs b/src/makefile/input.rs
index 7651306..ecf195a 100644
--- a/src/makefile/input.rs
+++ b/src/makefile/input.rs
@@ -503,8 +503,7 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> {
// don't interpret things like `.tmp: ; mkdir -p $@` as single-suffix rules
let inference_match = inference_match.and_then(|inference| {
- if (inference.s1.is_empty()
- || self.special_target_has_prereq(".SUFFIXES", inference.s1))
+ if self.special_target_has_prereq(".SUFFIXES", inference.s1)
&& (inference.s2.is_empty()
|| self.special_target_has_prereq(".SUFFIXES", inference.s2))
{
@@ -513,7 +512,7 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> {
log::info!(
"looks like {:?} is not a suffix rule because .SUFFIXES is {:?}",
inference,
- self.targets.get(".SUFFIXES")
+ self.targets.get(".SUFFIXES").map(|x| &x.prerequisites)
);
None
}