diff options
| author | kupfer <none@none> | 2007-05-03 16:04:05 -0700 |
|---|---|---|
| committer | kupfer <none@none> | 2007-05-03 16:04:05 -0700 |
| commit | 4e5b757fbcf21077677360be274461dcd9064106 (patch) | |
| tree | 3a5353aff37d2d3008613222146a3a86bed8f37d /usr/src/tools/scripts/bldenv.sh | |
| parent | 4d25c1d6097c545e02d2718b5cfa8e0e1845497e (diff) | |
| download | illumos-joyent-4e5b757fbcf21077677360be274461dcd9064106.tar.gz | |
6455242 nightly should be able to preserve all proto areas from a single build.
6467531 nightly(1) needs option to generate OpenSolaris delivery
--HG--
rename : usr/src/pkgdefs/SUNWftpu/copyright => usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE
Diffstat (limited to 'usr/src/tools/scripts/bldenv.sh')
| -rw-r--r-- | usr/src/tools/scripts/bldenv.sh | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh index 20f8a19354..af8d1cbd71 100644 --- a/usr/src/tools/scripts/bldenv.sh +++ b/usr/src/tools/scripts/bldenv.sh @@ -19,8 +19,9 @@ # # CDDL HEADER END # + # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -46,6 +47,7 @@ Where: c_FLAG=n f_FLAG=n d_FLAG=n +O_FLAG=n o_FLAG=n t_FLAG=n SE_FLAG=n @@ -163,16 +165,18 @@ shift # must match the getopts in nightly.sh OPTIND=1 NIGHTLY_OPTIONS=-${NIGHTLY_OPTIONS#-} -while getopts ABDFMNCGIRafinlmoptuUxdrtwzWS:X FLAG $NIGHTLY_OPTIONS +while getopts AaBCDdFfGIilMmNnOopRrS:tUuWwXxz FLAG $NIGHTLY_OPTIONS do case $FLAG in + O) O_FLAG=y + ;; + o) o_FLAG=y + ;; t ) t_FLAG=y ;; S ) set_S_flag $OPTARG ;; - o) o_FLAG=y - ;; *) ;; esac done @@ -193,6 +197,15 @@ else unset EXTRA_CFLAGS fi +if [ $O_FLAG = "y" ]; then + export MULTI_PROTO=yes + if [ "$CLOSED_IS_PRESENT" = "yes" ]; then + echo "CLOSED_IS_PRESENT is 'no' (because of '-O')" + fi + export CLOSED_IS_PRESENT=no + export ON_CLOSED_BINS=$CODEMGR_WS/closed.skel +fi + # update build-type variables CPIODIR=${CPIODIR}${SUFFIX} PKGARCHIVE=${PKGARCHIVE}${SUFFIX} @@ -225,12 +238,6 @@ if [ "${SUNWSPRO}" != "" ]; then export PATH fi -if [[ "$SO_FLAG" = "y" && "$CLOSED_IS_PRESENT" = "yes" ]]; then - echo "CLOSED_IS_PRESENT is 'no' (because of '-S O')" - CLOSED_IS_PRESENT=no - export CLOSED_IS_PRESENT -fi - if [ -z "$CLOSED_IS_PRESENT" ]; then if [ -d $SRC/../closed ]; then CLOSED_IS_PRESENT="yes" @@ -291,6 +298,16 @@ ENVCPPFLAGS3= ENVCPPFLAGS4= PARENT_ROOT= +[ "$O_FLAG" = "y" ] && export ROOT=$ROOT-open + +if [ "$MULTI_PROTO" != "yes" -a "$MULTI_PROTO" != "no" ]; then + echo "WARNING: invalid value for MULTI_PROTO ($MULTI_PROTO);" \ + "setting to \"no\"." + export MULTI_PROTO=no +fi + +[ "$MULTI_PROTO" = "yes" ] && export ROOT=$ROOT$SUFFIX + ENVLDLIBS1="-L$ROOT/lib -L$ROOT/usr/lib" ENVCPPFLAGS1="-I$ROOT/usr/include" MAKEFLAGS=e |