summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2005-03-15 14:25:24 +0000
committerharti <harti@FreeBSD.org>2005-03-15 14:25:24 +0000
commitdb06c5de06b7bcd5ec926db6f173b7c7d0e158a4 (patch)
tree457452aeaed619096133cc1fbc9fe804be9779df
parentd1b34cc38c81af8e8e47ba71ace1e8b1c28275f0 (diff)
downloadFreeBSD-src-db06c5de06b7bcd5ec926db6f173b7c7d0e158a4.zip
FreeBSD-src-db06c5de06b7bcd5ec926db6f173b7c7d0e158a4.tar.gz
Yet another version of passing the last line to ParseFinishLine().
It turns out that some ports use the obscure feature of spreading a dependency block across multiple include files. While this seems bad style, allow it for now and call said function only at end of all input to process the really last line of everything.
-rw-r--r--usr.bin/make/parse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 7068ada..c976d66 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -2534,14 +2534,14 @@ Parse_File(char *name, FILE *stream)
free(line);
}
- if (curFile.F != NULL)
- ParseFinishLine();
/*
* Reached EOF, but it may be just EOF of an include file...
*/
} while (ParseEOF(1) == CONTINUE);
+ ParseFinishLine();
+
/*
* Make sure conditionals are clean
*/
OpenPOWER on IntegriCloud