summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuha <none@none>2008-02-06 15:15:14 -0800
committersuha <none@none>2008-02-06 15:15:14 -0800
commitc65e19ff57535bc0e44cf15a019788acc60888ef (patch)
treed778b668e272d5e1d71166aa832300ef0c63edda
parent3b0164d5a9177d3e9e05e26ac275cc5bac564ed1 (diff)
downloadillumos-gate-c65e19ff57535bc0e44cf15a019788acc60888ef.tar.gz
6658523 bldenv -t should be the default
-rw-r--r--usr/src/tools/scripts/bldenv.111
-rw-r--r--usr/src/tools/scripts/bldenv.sh12
2 files changed, 13 insertions, 10 deletions
diff --git a/usr/src/tools/scripts/bldenv.1 b/usr/src/tools/scripts/bldenv.1
index 14e50feea2..a16ce7719c 100644
--- a/usr/src/tools/scripts/bldenv.1
+++ b/usr/src/tools/scripts/bldenv.1
@@ -18,15 +18,15 @@
.\" "
.\" " CDDL HEADER END
.\" "
-.\" "Copyright 2007 Sun Microsystems, Inc."
+.\" "Copyright 2008 Sun Microsystems, Inc."
.\" "All rights reserved"
.\" "Use is subject to license terms."
-.TH bldenv 1 "21 Mar 2007"
+.TH bldenv 1 "05 Feb 2008"
.SH NAME
.I bldenv
\- spawn shell for interactive incremental OS-Net consolidation builds
.SH SYNOPSIS
-\fBbldenv [-fdt] [-S E|H|D|O] <env_file> [command]\fP
+\fBbldenv [-fd] [+t] [-S E|H|D|O] <env_file> [command]\fP
.LP
.SH DESCRIPTION
.IX "OS-Net build tools" "bldenv" "" "\fBbldenv\fP"
@@ -79,7 +79,10 @@ only if $SHELL is unset or if it points to csh.
set up environment for doing DEBUG builds (default is non-DEBUG)
.TP
.B \-t
-set up environment to use the tools in usr/src/tools
+Build and use the tools in usr/src/tools (default setting).
+.TP
+.B \+t
+Use the build tools in "$ONBLD_TOOLS/bin".
.TP
.B \-S E
build the exportable source variant of the source product
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh
index af8d1cbd71..7f712bbc88 100644
--- a/usr/src/tools/scripts/bldenv.sh
+++ b/usr/src/tools/scripts/bldenv.sh
@@ -21,7 +21,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -30,13 +30,13 @@
# before spawning a shell for doing a release-style builds interactively
# and incrementally.
#
-USAGE='Usage: bldenv [-fdt] [ -S E|D|H|O ] <env_file> [ command ]
+USAGE='Usage: bldenv [-fd] [+t] [ -S E|D|H|O ] <env_file> [ command ]
Where:
-c Force the use of csh - ignore $SHELL
-f Invoke csh with -f
-d Setup a DEBUG build (default: non-DEBUG)
- -t use the tools in $SRC/tools
+ +t use the tools in $ONBLD_TOOLS/bin
-S Build a variant of the source product
E - build exportable source
D - build domestic source (exportable + crypt)
@@ -49,7 +49,7 @@ f_FLAG=n
d_FLAG=n
O_FLAG=n
o_FLAG=n
-t_FLAG=n
+t_FLAG=y
SE_FLAG=n
SH_FLAG=n
SD_FLAG=n
@@ -97,7 +97,7 @@ do
d ) d_FLAG=y
SUFFIX=""
;;
- t ) t_FLAG=y
+ +t ) t_FLAG=n
;;
S )
set_S_flag $OPTARG
@@ -172,7 +172,7 @@ do
;;
o) o_FLAG=y
;;
- t ) t_FLAG=y
+ +t ) t_FLAG=n
;;
S )
set_S_flag $OPTARG