git: 2c5dcc54473f - main - make_check: Deobit fmake support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Jan 2024 19:16:04 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5dcc54473f4136c872987b3126540d61808b07 commit 2c5dcc54473f4136c872987b3126540d61808b07 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-01-02 16:47:10 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-01-03 19:14:17 +0000 make_check: Deobit fmake support We don't need make_check to work in a fmake world anymore (nor have we in the past decade). Just remove it here. Note in passing it's been 10 years since we've added a new test here and maybe we're past the need for this part of the build (or need to revamp it to include all the features added to bmake since 2016 that the build system silently depends on). Sponsored by: Netflix Reviewed by: brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/980 --- tools/build/make_check/Makefile | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index 9640a3755ecb..d9efa7e4f8ab 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -58,10 +58,6 @@ all: @echo "ok 14 shell # Test shell detected no regression." @${SMAKE} shell_1 || ${SMAKE} failure @echo "ok 15 shell_1 # Test shell_1 detected no regression." -.if !defined(.PARSEDIR) - @${SMAKE} shell_2 || ${SMAKE} failure - @echo "ok 16 shell_2 # Test shell_2 detected no regression." -.endif .if make(C_check) C_check: @@ -101,7 +97,6 @@ notdef: .endif .if make(modifiers) -.if defined(.PARSEDIR) # check if bmake can expand plain variables .MAKE.EXPAND_VARIABLES= yes x!= ${SMAKE} -V .CURDIR:H @@ -109,21 +104,6 @@ modifiers: .if ${.CURDIR:H} != "$x" @false .endif -.else -# See if make(1) supports the C modifier. -modifiers: dollarV - @if ${SMAKE} -V .CURDIR:C/.// 2>&1 >/dev/null | \ - grep -q "Unknown modifier 'C'"; then \ - false; \ - fi - -# check that make -V '${VAR}' works -V_expn != V_OK=ok ${SMAKE} -r -f /dev/null -V '$${V_OK}' -dollarV: -.if ${V_expn} == "" - @false -.endif -.endif .endif .if make(arith_expr)