Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ diff -b -u <(egrep -v '^[ ]*$|^#' usr/src/tools/env/illumos.sh) <(egrep -v '^[ ]*$|^#' illumos.sh)
- --- /dev/fd/63 Tue Nov 13 15:46:31 2018
- +++ /dev/fd/62 Tue Nov 13 15:46:31 2018
- @@ -1,4 +1,4 @@
- -export NIGHTLY_OPTIONS='-FnCDAlmprt'
- +export NIGHTLY_OPTIONS='-nCDAmprtl'
- export CODEMGR_WS="`git rev-parse --show-toplevel`"
- function maxjobs
- {
- @@ -29,7 +29,6 @@
- }
- maxjobs DMAKE_MAX_JOBS # "DMAKE_MAX_JOBS" passed as ksh(1) name reference
- export DMAKE_MAX_JOBS
- -ONBLD_BIN='/opt/onbld/bin'
- export PARENT_WS=''
- export CLONE_WS='ssh://anonhg@hg.illumos.org/illumos-gate'
- export STAFFER="$LOGNAME"
- @@ -43,7 +42,8 @@
- export ROOT="$CODEMGR_WS/proto/root_${MACH}"
- export SRC="$CODEMGR_WS/usr/src"
- export MULTI_PROTO="no"
- -export VERSION="`git describe --long --all HEAD | cut -d/ -f2-`"
- +git_version="`git describe --long --all HEAD | cut -d/ -f2-`"
- +export VERSION="`basename $CODEMGR_WS`-$git_version"
- export PARENT_ROOT="$PARENT_WS/proto/root_$MACH"
- export PARENT_TOOLS_ROOT="$PARENT_WS/usr/src/tools/proto/root_$MACH-nd"
- export PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly"
- @@ -55,3 +55,11 @@
- export SPRO_ROOT='/opt/SUNWspro'
- export SPRO_VROOT="$SPRO_ROOT"
- export ENABLE_SMB_PRINTING=
- +export PKGVERS_BRANCH=9999.99.0.0
- +export PERL_VERSION="5.22"
- +export PERL_PKGVERS="-522"
- +export BLD_JAVA_8=
- +export PRIMARY_CC=gcc4,/opt/gcc/4.4.4/bin/gcc,gnu
- +export PRIMARY_CCC=gcc4,/opt/gcc/4.4.4/bin/g++,gnu
- +export SHADOW_CCS=gcc7,/usr/gcc/7/bin/gcc,gnu
- +export SHADOW_CCCS=gcc7,/usr/gcc/7/bin/g++,gnu
Add Comment
Please, Sign In to add comment