]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Merge bmake-20220208
authorSimon J. Gerraty <sjg@FreeBSD.org>
Wed, 9 Feb 2022 17:25:03 +0000 (09:25 -0800)
committerSimon J. Gerraty <sjg@FreeBSD.org>
Wed, 9 Feb 2022 17:31:30 +0000 (09:31 -0800)
commita6f0e10b24b6011dd5f71c99848ddeef264d9ac9
tree7e10aa6c6ba33dfaf855eb64ece3a8e9cbc5a677
parentedfb339d3868bbd36393efb2738287e170767784
parent535c59a6a9214436f5d6643775d29808e4b3408d
Merge bmake-20220208

        * unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
        is any chance we have dash as .SHELL

        * meta.c: use a variable to hold command line to be filtered
        to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'
16 files changed:
contrib/bmake/ChangeLog
contrib/bmake/FILES
contrib/bmake/VERSION
contrib/bmake/meta.c
contrib/bmake/mk/ChangeLog
contrib/bmake/mk/cc-wrap.mk
contrib/bmake/mk/install-mk
contrib/bmake/mk/sys.vars.mk
contrib/bmake/os.sh
contrib/bmake/parse.c
contrib/bmake/unit-tests/Makefile
contrib/bmake/unit-tests/suff-use.exp
contrib/bmake/unit-tests/suff-use.mk
contrib/bmake/unit-tests/var-scope-local.mk
usr.bin/bmake/Makefile.config
usr.bin/bmake/unit-tests/Makefile