summaryrefslogtreecommitdiff
path: root/usr/src/tools/env
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-11-28 14:19:44 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-11-28 14:19:44 +0000
commit4540092fecc3a4d04cb2aac8fd60bdd378b5c6e0 (patch)
treee3948df2ca0f78dacdb381ba2ba4081af6b06e07 /usr/src/tools/env
parentb118ac96296ecb7740c933bfe013b565a00b56c5 (diff)
parentf9008f8deff5da21c46ffed5dff700071bcf884e (diff)
downloadillumos-joyent-4540092fecc3a4d04cb2aac8fd60bdd378b5c6e0.tar.gz
[illumos-gate merge]
commit f9008f8deff5da21c46ffed5dff700071bcf884e 9978 env: set gcc 7 as shadow compiler and do not run lint commit f8fdf6812567ce1a3b76a6bee2ee3f04bd3fcaca 9963 Seperate tunable for disabling ZIL vdev flush
Diffstat (limited to 'usr/src/tools/env')
-rw-r--r--usr/src/tools/env/illumos.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh
index 56137d4beb..51c2a458c1 100644
--- a/usr/src/tools/env/illumos.sh
+++ b/usr/src/tools/env/illumos.sh
@@ -35,7 +35,6 @@
# do not bringover from the parent (-n)
# runs 'make check' (-C)
# checks for new interfaces in libraries (-A)
-# runs lint in usr/src (-l plus the LINTDIRS variable)
# sends mail on completion (-m and the MAILTO variable)
# creates packages for PIT/RE (-p)
# checks for changes in ELF runpaths (-r)
@@ -46,7 +45,7 @@
# - This script is only interpreted by ksh93 and explicitly allows the
# use of ksh93 language extensions.
#
-export NIGHTLY_OPTIONS='-FnCDAlmprt'
+export NIGHTLY_OPTIONS='-FnCDAmprt'
# CODEMGR_WS - where is your workspace at
#export CODEMGR_WS="$HOME/ws/illumos-gate"
@@ -224,6 +223,8 @@ export SPRO_VROOT="$SPRO_ROOT"
#
# To disable shadow compilation, unset SHADOW_* or set them to the empty string.
#
+export SHADOW_CCS=gcc7,/usr/gcc/7/bin/gcc,gnu
+export SHADOW_CCCS=gcc7,/usr/gcc/7/bin/g++,gnu
# This goes along with lint - it is a series of the form "A [y|n]" which
# means "go to directory A and run 'make lint'" Then mail me (y) the