Date: Fri, 29 May 2015 06:44:09 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r283688 - projects/bmake/targets Message-ID: <201505290644.t4T6i9BZ051508@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Fri May 29 06:44:09 2015 New Revision: 283688 URL: https://svnweb.freebsd.org/changeset/base/283688 Log: Adapt based on whether 'mk' wrapper is used. If 'mk' is used we can expect SB_NAME to be set. Use 'mk' versions of command suggestions. Otherwise 'make' version - a bit more cumbersom. Modified: projects/bmake/targets/Makefile.xtras Modified: projects/bmake/targets/Makefile.xtras ============================================================================== --- projects/bmake/targets/Makefile.xtras Fri May 29 06:31:39 2015 (r283687) +++ projects/bmake/targets/Makefile.xtras Fri May 29 06:44:09 2015 (r283688) @@ -11,9 +11,19 @@ _here := ${_PARSEDIR} .MAIN: no-default +.if !empty(SB_NAME) +# mk wrapper +MAKE_CMD= mk +MAKE_MACHINE_CMD= mk --machine <machine> +.else +# not using 'mk' +MAKE_CMD= ${.MAKE:T} +MAKE_MACHINE_CMD= env MACHINE=<machine> ${.MAKE:T} +.endif + no-default: @echo "ERROR: there is no supported default target."; \ - echo "Try 'mk help'" + echo "Try '${MAKE_CMD} help'" .if make(show-valid-targets) @@ -25,7 +35,8 @@ BUILD_TARGETS != cd ${_here} && \ sed 's,/Makefile.*,,;s,^./,,' | sort -u show-valid-targets: - @echo "Build targets for ${MACHINE}:"; echo "${BUILD_TARGETS:ts\n}" + @echo "Build targets for ${MACHINE} (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):" + @echo "${BUILD_TARGETS:ts\n}" @echo; echo "Other targets:"; echo "${OTHER_TARGETS:ts\n}" .endif @@ -33,7 +44,7 @@ help: show-help show-help: @echo; \ echo "You can see the targets which are valid for a given machine"; \ - echo "by running 'mk --machine <machine> show-valid-targets'"; \ + echo "by running '${MAKE_MACHINE_CMD} show-valid-targets'"; \ echo "For other information, read: ${HELP_DOCS:@d@${.newline}$d@}"; \ echo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505290644.t4T6i9BZ051508>