Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests make(1): use consistent order in .OO...



details:   https://anonhg.NetBSD.org/src/rev/abb278da36c8
branches:  trunk
changeset: 955707:abb278da36c8
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Oct 09 06:44:42 2020 +0000

description:
make(1): use consistent order in .OODATE in test archive.mk

diffstat:

 usr.bin/make/unit-tests/archive.exp |  2 +-
 usr.bin/make/unit-tests/archive.mk  |  6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r b4ed8288127f -r abb278da36c8 usr.bin/make/unit-tests/archive.exp
--- a/usr.bin/make/unit-tests/archive.exp       Fri Oct 09 05:41:16 2020 +0000
+++ b/usr.bin/make/unit-tests/archive.exp       Fri Oct 09 06:44:42 2020 +0000
@@ -13,7 +13,7 @@
 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
diff -r b4ed8288127f -r abb278da36c8 usr.bin/make/unit-tests/archive.mk
--- a/usr.bin/make/unit-tests/archive.mk        Fri Oct 09 05:41:16 2020 +0000
+++ b/usr.bin/make/unit-tests/archive.mk        Fri Oct 09 06:44:42 2020 +0000
@@ -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 @@
 # 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 @@
        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



Home | Main Index | Thread Index | Old Index