summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2004-08-12 19:14:10 +0000
committerharti <harti@FreeBSD.org>2004-08-12 19:14:10 +0000
commit883c945b5c98b38564cf24bee48c4875f1cbf18a (patch)
treef5c772b726ad108f73772e732eb53d37d1508ad0
parent411d86faa7ab7d1260f311ed09b8f64327bb1bfd (diff)
downloadFreeBSD-src-883c945b5c98b38564cf24bee48c4875f1cbf18a.zip
FreeBSD-src-883c945b5c98b38564cf24bee48c4875f1cbf18a.tar.gz
Now that make more correctly handles variable assignments
in .MAKEFLAGS targets enable the regression test for this.
-rw-r--r--tools/build/make_check/Makefile4
-rw-r--r--tools/regression/usr.bin/make/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index 0ecd855..a58f9ab 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -205,9 +205,7 @@ pass_cmd_vars_3_1:
.MAKEFLAGS: CMD1=baz1
pass_cmd_vars_4:
- @:
-# The following does not work yet (see standards/57295)
-# @${MAKE} pass_cmd_vars_4_1
+ @${MAKE} pass_cmd_vars_4_1
.if ${CMD1} != baz1 || ${CMD2} != cmd2
.error MAKEFLAGS-passed variables not overridden via .MAKEFLAGS target
diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile
index 0ecd855..a58f9ab 100644
--- a/tools/regression/usr.bin/make/Makefile
+++ b/tools/regression/usr.bin/make/Makefile
@@ -205,9 +205,7 @@ pass_cmd_vars_3_1:
.MAKEFLAGS: CMD1=baz1
pass_cmd_vars_4:
- @:
-# The following does not work yet (see standards/57295)
-# @${MAKE} pass_cmd_vars_4_1
+ @${MAKE} pass_cmd_vars_4_1
.if ${CMD1} != baz1 || ${CMD2} != cmd2
.error MAKEFLAGS-passed variables not overridden via .MAKEFLAGS target
OpenPOWER on IntegriCloud