Print this page
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/scripts/bldenv.sh
          +++ new/usr/src/tools/scripts/bldenv.sh
↓ open down ↓ 337 lines elided ↑ open up ↑
 338  338          VERSION+=":OPEN_ONLY"
 339  339          SRC="${OPEN_SRCDIR}/usr/src"
 340  340  fi
 341  341  
 342  342  #       Set PATH for a build
 343  343  PATH="/opt/onbld/bin:/opt/onbld/bin/${MACH}:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/etc:/usr/openwin/bin:/usr/sfw/bin:/opt/sfw/bin:."
 344  344  if [[ "${SUNWSPRO}" != "" ]]; then 
 345  345          export PATH="${SUNWSPRO}/bin:$PATH" 
 346  346  fi 
 347  347  
 348      -if [[ -z "$CLOSED_IS_PRESENT" ]]; then
 349      -        if [[ -d $SRC/../closed ]]; then
 350      -                export CLOSED_IS_PRESENT="yes"
 351      -        else
 352      -                export CLOSED_IS_PRESENT="no"
 353      -        fi
 354      -fi
 355      -
 356  348  TOOLS="${SRC}/tools"
 357  349  TOOLS_PROTO="${TOOLS}/proto/root_${MACH}-nd" ; export TOOLS_PROTO
 358  350  
 359  351  if "${flags.t}" ; then
 360  352          export ONBLD_TOOLS="${ONBLD_TOOLS:=${TOOLS_PROTO}/opt/onbld}"
 361  353  
 362  354          export STABS="${TOOLS_PROTO}/opt/onbld/bin/${MACH}/stabs"
 363  355          export CTFSTABS="${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfstabs"
 364  356          export GENOFFSETS="${TOOLS_PROTO}/opt/onbld/bin/genoffsets"
 365  357  
↓ open down ↓ 45 lines elided ↑ open up ↑
 411  403  
 412  404  if [[ "$MULTI_PROTO" != "yes" && "$MULTI_PROTO" != "no" ]]; then
 413  405          printf \
 414  406              'WARNING: invalid value for MULTI_PROTO (%s); setting to "no".\n' \
 415  407              "$MULTI_PROTO"
 416  408          export MULTI_PROTO="no"
 417  409  fi
 418  410  
 419  411  [[ "$MULTI_PROTO" == "yes" ]] && export ROOT="${ROOT}${SUFFIX}"
 420  412  
 421      -export TONICBUILD="#"
 422      -
 423  413  if "${flags.O}" ; then 
 424      -        if [[ "$CLOSED_IS_PRESENT" != "yes" ]]; then
 425      -                print "OpenSolaris closed binary generation requires "
 426      -                print "closed tree"
 427      -                exit 1
 428      -        fi
 429      -        print "Generating OpenSolaris deliverables"
 430      -        # We only need CLOSEDROOT in the env for convenience. Makefile.master
 431      -        # figures out what it needs when it matters.
 432      -        export CLOSEDROOT="${ROOT}-closed"
 433      -        export TONICBUILD=""
      414 +        print "OpenSolaris closed binary generation requires "
      415 +        print "closed tree"
      416 +        exit 1
 434  417  fi
 435  418  
 436  419  ENVLDLIBS1="-L$ROOT/lib -L$ROOT/usr/lib"
 437  420  ENVCPPFLAGS1="-I$ROOT/usr/include"
 438  421  MAKEFLAGS=e
 439  422  
 440  423  export \
 441  424          ENVLDLIBS1 \
 442  425          ENVLDLIBS2 \
 443  426          ENVLDLIBS3 \
↓ open down ↓ 49 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX