diff options
| author | sjg <sjg@FreeBSD.org> | 2014-01-27 17:47:21 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-01-27 17:47:21 +0000 |
| commit | a327d8d25378c580f18d33788bbca7c0586790cb (patch) | |
| tree | 891905810fa98d3e2af074a163a102a34c3641ad /contrib/bmake/boot-strap | |
| parent | a9f1fd52d431247c153372d27b2e0baa80b5a147 (diff) | |
| download | FreeBSD-src-a327d8d25378c580f18d33788bbca7c0586790cb.zip FreeBSD-src-a327d8d25378c580f18d33788bbca7c0586790cb.tar.gz | |
Merge bmake-20140101 from vendor
Diffstat (limited to 'contrib/bmake/boot-strap')
| -rwxr-xr-x | contrib/bmake/boot-strap | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/contrib/bmake/boot-strap b/contrib/bmake/boot-strap index 2193926..3c25c37 100755 --- a/contrib/bmake/boot-strap +++ b/contrib/bmake/boot-strap @@ -111,7 +111,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.43 2013/03/02 18:55:23 sjg Exp $ +# $Id: boot-strap,v 1.44 2014/01/08 14:49:10 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -216,11 +216,9 @@ do --share=*) share_dir=`get_optarg "$1"`;; --share) share_dir="$2"; shift;; --with-default-sys-path=*) - CONFIGURE_ARGS="$1" - MAKESYSPATH=`get_optarg "$1"`;; + CONFIGURE_ARGS="$1";; --with-default-sys-path) - CONFIGURE_ARGS="$1 $2" - MAKESYSPATH="$2"; shift;; + CONFIGURE_ARGS="$1 $2";; --install) INSTALL_PREFIX=${INSTALL_PREFIX:-$prefix};; --install-host-target) INSTALL_PREFIX=${INSTALL_PREFIX:-$prefix} @@ -330,8 +328,8 @@ add_path () { srcdir=`GetDir /bmake make-bootstrap.sh.in "$srcdir" "$2" "$Mydir" ./bmake* "$Mydir"/../bmake*` [ -d "${srcdir:-/dev/null}" ] || Usage case "$mksrc" in -none|-) # we don't want it - mksrc= +none|-) # we ignore this now + mksrc=$Mydir/mk ;; .../*) # find here or above mksrc=`FindHereOrAbove -C "$Mydir" -s "$mksrc/sys.mk"` |
