Module Name: src
Committed By: rillig
Date: Fri Oct 9 06:44:42 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: archive.exp archive.mk
Log Message:
make(1): use consistent order in .OODATE in test archive.mk
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/archive.exp
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/archive.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/archive.exp
diff -u src/usr.bin/make/unit-tests/archive.exp:1.6 src/usr.bin/make/unit-tests/archive.exp:1.7
--- src/usr.bin/make/unit-tests/archive.exp:1.6 Thu Oct 8 18:37:26 2020
+++ src/usr.bin/make/unit-tests/archive.exp Fri Oct 9 06:44:42 2020
@@ -13,7 +13,7 @@ archive.mk
modmisc.mk
varmisc.mk
-Making list-archive-wildcard out-of-date ternary.mk archive-suffix.mk archive.mk
+Making list-archive-wildcard out-of-date archive-suffix.mk archive.mk ternary.mk
list-archive-wildcard: archive-suffix.mk
list-archive-wildcard: archive.mk
list-archive-wildcard: ternary.mk
Index: src/usr.bin/make/unit-tests/archive.mk
diff -u src/usr.bin/make/unit-tests/archive.mk:1.9 src/usr.bin/make/unit-tests/archive.mk:1.10
--- src/usr.bin/make/unit-tests/archive.mk:1.9 Thu Oct 8 18:37:26 2020
+++ src/usr.bin/make/unit-tests/archive.mk Fri Oct 9 06:44:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: archive.mk,v 1.9 2020/10/08 18:37:26 rillig Exp $
+# $NetBSD: archive.mk,v 1.10 2020/10/09 06:44:42 rillig Exp $
#
# Very basic demonstration of handling archives, based on the description
# in PSD.doc/tutorial.ms.
@@ -35,7 +35,7 @@ create-archive: ${ARCHIVE} pre post
# Arch_ParseArchive is called, the dependency line is already fully expanded.
#
${ARCHIVE}: $${:Ulibprog.a}(archive.mk modmisc.mk $${:Uvarmisc.mk}) pre post
- ar cru ${.TARGET} ${.OODATE}
+ ar cru ${.TARGET} ${.OODATE:O}
ranlib ${.TARGET}
list-archive: ${ARCHIVE} pre post
@@ -57,6 +57,6 @@ remove-archive: pre post
rm -f ${ARCHIVE}
pre: .USEBEFORE
- @echo Making ${.TARGET} ${.OODATE:C,.+,out-of-date,W} ${.OODATE}
+ @echo Making ${.TARGET} ${.OODATE:C,.+,out-of-date,W} ${.OODATE:O}
post: .USE
@echo
