diff options
| author | marcel <marcel@FreeBSD.org> | 2012-08-22 19:25:57 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2012-08-22 19:25:57 +0000 |
| commit | 9dd41e3647df728006e0749ac139cfeb773c3873 (patch) | |
| tree | cd79e2918968cd4506cfed6dbf7f1829c11aa985 /tools/build | |
| parent | cf2de346b025671794fb9ccead67d707250e0584 (diff) | |
| download | FreeBSD-src-9dd41e3647df728006e0749ac139cfeb773c3873.zip FreeBSD-src-9dd41e3647df728006e0749ac139cfeb773c3873.tar.gz | |
Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
Diffstat (limited to 'tools/build')
| -rw-r--r-- | tools/build/make_check/Makefile | 15 | ||||
| -rw-r--r-- | tools/build/mk/Makefile.boot | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index 346b4bb..9c37c3f 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -22,8 +22,17 @@ NIL= SMAKE= MAKEFLAGS= ${MAKE} -C ${.CURDIR} +.if !make(shell*) +# check that make -V '${VARIABLE}' works +V_expn != V_OK=ok ${SMAKE} -r -f /dev/null -V '$${V_OK}' +.endif + all: - @echo '1..16' + @echo '0..16' + @test "${V_expn}" != "" || \ + { echo ${MAKE} -V '$${VARIABLE}': no output; \ + ${MAKE} -C ${.CURDIR} failure; } + @echo "ok 0 - make -V # handles substitution" @${SMAKE} C_check || { cd ${.CURDIR} ; ${MAKE} failure ; } @echo "ok 1 - C_check # Test of -C flag existence detected no regression." @echo 1:${DATA1} 2:${DATA2} 3:${DATA3} 4:${DATA4} 5:${DATA5} | \ @@ -56,8 +65,12 @@ 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) + @echo "skipped 16 shell_2 # bmake handles shell errors differently" +.else @${SMAKE} shell_2 || ${SMAKE} failure @echo "ok 16 shell_2 # Test shell_2 detected no regression." +.endif .if make(C_check) C_check: diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot index 0707ae2..b75809b 100644 --- a/tools/build/mk/Makefile.boot +++ b/tools/build/mk/Makefile.boot @@ -4,3 +4,6 @@ CFLAGS+= -I${WORLDTMP}/legacy/usr/include DPADD+= ${WORLDTMP}/legacy/usr/lib/libegacy.a LDADD+= -legacy LDFLAGS+= -L${WORLDTMP}/legacy/usr/lib + +# we do not want to capture dependencies refering to the above +UPDATE_DEPENDFILE= no |
