4526 nightly contains a great deal of effectively dead code

@@ -162,10 +162,11 @@
         LC_NUMERIC=C \
         LC_TIME=C
 
 # clear environment variables we know to be bad for the build
 unset \
+        CH \
         LD_OPTIONS \
         LD_LIBRARY_PATH \
         LD_AUDIT \
         LD_BIND_NOW \
         LD_BREADTH \

@@ -225,15 +226,13 @@
 [[ -f "${CODEMGR_WS}/usr/src/Makefile" ]] || fatal_error "Error: ${CODEMGR_WS}/usr/src/Makefile not found."
 
 # must match the getopts in nightly.sh
 OPTIND=1
 NIGHTLY_OPTIONS="-${NIGHTLY_OPTIONS#-}"
-while getopts '+0AaBCDdFfGIilMmNnopRrtUuWwXxz' FLAG "$NIGHTLY_OPTIONS"
+while getopts '+0ABCDdFfGIilMmNnpRrtUuw' FLAG "$NIGHTLY_OPTIONS"
 do
         case "$FLAG" in
-          o)    flags.o=true  ;;
-          +o)   flags.o=false ;;
           t)    flags.t=true  ;;
           +t)   flags.t=false ;;
           *)    ;;
         esac
 done

@@ -301,23 +300,14 @@
         export PATH
 fi
 
 export DMAKE_MODE=${DMAKE_MODE:-parallel}
 
-if "${flags.o}" ; then
-        export CH=
-else
-        unset CH
-fi
 DEF_STRIPFLAG="-s"
 
 TMPDIR="/tmp"
 
-# "o_FLAG" is used by "nightly.sh" (it may be useful to rename this
-# variable using a more descriptive name later)
-export o_FLAG="$(${flags.o} && print 'y' || print 'n')"
-
 export \
         PATH TMPDIR \
         POUND_SIGN \
         DEF_STRIPFLAG \
         RELEASE_DATE