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

*** 343,360 **** 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:." if [[ "${SUNWSPRO}" != "" ]]; then export PATH="${SUNWSPRO}/bin:$PATH" fi - if [[ -z "$CLOSED_IS_PRESENT" ]]; then - if [[ -d $SRC/../closed ]]; then - export CLOSED_IS_PRESENT="yes" - else - export CLOSED_IS_PRESENT="no" - fi - fi - TOOLS="${SRC}/tools" TOOLS_PROTO="${TOOLS}/proto/root_${MACH}-nd" ; export TOOLS_PROTO if "${flags.t}" ; then export ONBLD_TOOLS="${ONBLD_TOOLS:=${TOOLS_PROTO}/opt/onbld}" --- 343,352 ----
*** 416,438 **** export MULTI_PROTO="no" fi [[ "$MULTI_PROTO" == "yes" ]] && export ROOT="${ROOT}${SUFFIX}" - export TONICBUILD="#" - if "${flags.O}" ; then - if [[ "$CLOSED_IS_PRESENT" != "yes" ]]; then print "OpenSolaris closed binary generation requires " print "closed tree" exit 1 - fi - print "Generating OpenSolaris deliverables" - # We only need CLOSEDROOT in the env for convenience. Makefile.master - # figures out what it needs when it matters. - export CLOSEDROOT="${ROOT}-closed" - export TONICBUILD="" fi ENVLDLIBS1="-L$ROOT/lib -L$ROOT/usr/lib" ENVCPPFLAGS1="-I$ROOT/usr/include" MAKEFLAGS=e --- 408,421 ----