Date: Thu, 14 Mar 2024 05:08:43 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 3ff501040ba7 - main - bmake Makefile.config Message-ID: <202403140508.42E58hSk070194@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff501040ba79894a3b4ed712d7ae4252590fc84 commit 3ff501040ba79894a3b4ed712d7ae4252590fc84 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2024-03-14 05:08:29 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2024-03-14 05:08:29 +0000 bmake Makefile.config --- usr.bin/bmake/Makefile | 2 +- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/unit-tests/Makefile | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index b91394765301..5a0bf44fb0fb 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.125 2023/05/17 00:15:46 sjg Exp $ +# $Id: Makefile,v 1.126 2024/03/10 17:46:44 sjg Exp $ PROG?= ${.CURDIR:T} diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 4062f175f763..88ec643b8a4a 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -6,7 +6,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20240108 +_MAKE_VERSION?=20240309 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index cf6c85809b9c..dcec9297828c 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -1,7 +1,7 @@ # This is a generated file, do NOT edit! # See contrib/bmake/bsd.after-import.mk # -# $Id: Makefile,v 1.210 2024/01/08 18:28:08 sjg Exp $ +# $Id: Makefile,v 1.211 2024/03/10 17:46:44 sjg Exp $ # # $NetBSD: Makefile,v 1.342 2024/01/07 02:07:44 sjg Exp $ # @@ -477,6 +477,15 @@ BROKEN_TESTS+= sh-flags BROKEN_TESTS+= varmod-localtime .endif +.if ${.MAKE.OS:NCYGWIN*} == "" +BROKEN_TESTS+= \ + export \ + opt-chdir \ + opt-keep-going-indirect \ + +.endif + + .if ${.MAKE.OS:NDarwin} == "" BROKEN_TESTS+= shell-ksh .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403140508.42E58hSk070194>