Print this page
4526 nightly contains a great deal of effectively dead code

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/scripts/bldenv.sh
          +++ new/usr/src/tools/scripts/bldenv.sh
↓ open down ↓ 156 lines elided ↑ open up ↑
 157  157  export \
 158  158          LC_COLLATE=C \
 159  159          LC_CTYPE=C \
 160  160          LC_MESSAGES=C \
 161  161          LC_MONETARY=C \
 162  162          LC_NUMERIC=C \
 163  163          LC_TIME=C
 164  164  
 165  165  # clear environment variables we know to be bad for the build
 166  166  unset \
      167 +        CH \
 167  168          LD_OPTIONS \
 168      -        LD_LIBRARY_PATH \
 169      -        LD_AUDIT \
 170      -        LD_BIND_NOW \
 171      -        LD_BREADTH \
 172      -        LD_CONFIG \
      169 +        LD_LIBRARY_PATH \
      170 +        LD_AUDIT \
      171 +        LD_BIND_NOW \
      172 +        LD_BREADTH \
      173 +        LD_CONFIG \
 173  174          LD_DEBUG \
 174      -        LD_FLAGS \
 175      -        LD_LIBRARY_PATH_64 \
 176      -        LD_NOVERSION \
 177      -        LD_ORIGIN \
      175 +        LD_FLAGS \
      176 +        LD_LIBRARY_PATH_64 \
      177 +        LD_NOVERSION \
      178 +        LD_ORIGIN \
 178  179          LD_LOADFLTR \
 179      -        LD_NOAUXFLTR \
 180      -        LD_NOCONFIG \
 181      -        LD_NODIRCONFIG \
 182      -        LD_NOOBJALTER \
      180 +        LD_NOAUXFLTR \
      181 +        LD_NOCONFIG \
      182 +        LD_NODIRCONFIG \
      183 +        LD_NOOBJALTER \
 183  184          LD_PRELOAD \
 184      -        LD_PROFILE \
      185 +        LD_PROFILE \
 185  186          CONFIG \
 186  187          GROUP \
 187  188          OWNER \
 188  189          REMOTE \
 189  190          ENV \
 190  191          ARCH \
 191  192          CLASSPATH
 192  193  
 193  194  #
 194  195  # Setup environment variables
↓ open down ↓ 25 lines elided ↑ open up ↑
 220  221  # STDENV_END
 221  222  
 222  223  # Check if we have sufficient data to continue...
 223  224  [[ -v CODEMGR_WS ]] || fatal_error "Error: Variable CODEMGR_WS not set."
 224  225  [[ -d "${CODEMGR_WS}" ]] || fatal_error "Error: ${CODEMGR_WS} is not a directory."
 225  226  [[ -f "${CODEMGR_WS}/usr/src/Makefile" ]] || fatal_error "Error: ${CODEMGR_WS}/usr/src/Makefile not found."
 226  227  
 227  228  # must match the getopts in nightly.sh
 228  229  OPTIND=1
 229  230  NIGHTLY_OPTIONS="-${NIGHTLY_OPTIONS#-}"
 230      -while getopts '+0AaBCDdFfGIilMmNnopRrtUuWwXxz' FLAG "$NIGHTLY_OPTIONS"
      231 +while getopts '+0ABCDdFfGIilMmNnpRrtUuw' FLAG "$NIGHTLY_OPTIONS"
 231  232  do
 232  233          case "$FLAG" in
 233      -          o)    flags.o=true  ;;
 234      -          +o)   flags.o=false ;;
 235  234            t)    flags.t=true  ;;
 236  235            +t)   flags.t=false ;;
 237  236            *)    ;;
 238  237          esac
 239  238  done
 240  239  
 241  240  POUND_SIGN="#"
 242  241  # have we set RELEASE_DATE in our env file?
 243  242  if [ -z "$RELEASE_DATE" ]; then
 244  243          RELEASE_DATE=$(LC_ALL=C date +"%B %Y")
↓ open down ↓ 51 lines elided ↑ open up ↑
 296  295          export CTFCVTPTBL="${TOOLS_PROTO}/opt/onbld/bin/ctfcvtptbl"
 297  296          export CTFFINDMOD="${TOOLS_PROTO}/opt/onbld/bin/ctffindmod"
 298  297  
 299  298          PATH="${TOOLS_PROTO}/opt/onbld/bin/${MACH}:${PATH}"
 300  299          PATH="${TOOLS_PROTO}/opt/onbld/bin:${PATH}"
 301  300          export PATH
 302  301  fi
 303  302  
 304  303  export DMAKE_MODE=${DMAKE_MODE:-parallel}
 305  304  
 306      -if "${flags.o}" ; then
 307      -        export CH=
 308      -else
 309      -        unset CH
 310      -fi
 311  305  DEF_STRIPFLAG="-s"
 312  306  
 313  307  TMPDIR="/tmp"
 314  308  
 315      -# "o_FLAG" is used by "nightly.sh" (it may be useful to rename this
 316      -# variable using a more descriptive name later)
 317      -export o_FLAG="$(${flags.o} && print 'y' || print 'n')"
 318      -
 319  309  export \
 320  310          PATH TMPDIR \
 321  311          POUND_SIGN \
 322  312          DEF_STRIPFLAG \
 323  313          RELEASE_DATE
 324  314  unset \
 325  315          CFLAGS \
 326  316          LD_LIBRARY_PATH
 327  317  
 328  318  # a la ws
↓ open down ↓ 76 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX