diff options
| author | Robert Mustacchi <rm@fingolfin.org> | 2021-10-11 07:21:29 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@fingolfin.org> | 2021-10-13 19:50:52 -0700 |
| commit | a190135a5de9f6c93d19ec7b3ee608084be06b1a (patch) | |
| tree | cf292d3a13211f87195ac98e1868db5b0fa5937c /usr/src | |
| parent | 65d1f0742f55ae3c26153e2686e666d5ba1ae17f (diff) | |
| download | illumos-joyent-a190135a5de9f6c93d19ec7b3ee608084be06b1a.tar.gz | |
14149 Use gcc10 as the shadow compiler
14150 illumos.sh should point to default closed bins
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/tools/env/illumos.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh index 7c9b97d113..a1f7d356ab 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -82,8 +82,8 @@ export CODEMGR_WS="`git rev-parse --show-toplevel`" export GNUC_ROOT=/usr/gcc/7 export PRIMARY_CC=gcc7,$GNUC_ROOT/bin/gcc,gnu export PRIMARY_CCC=gcc7,$GNUC_ROOT/bin/g++,gnu -export SHADOW_CCS=gcc4,/opt/gcc/4.4.4/bin/gcc,gnu -export SHADOW_CCCS=gcc4,/opt/gcc/4.4.4/bin/g++,gnu +export SHADOW_CCS=gcc10,/usr/gcc/10/bin/gcc,gnu +export SHADOW_CCCS=gcc10,/usr/gcc/10/bin/g++,gnu # comment to disable smatch export ENABLE_SMATCH=1 @@ -227,7 +227,7 @@ export MACH="$(uname -p)" # totally freed itself, we can remove this reference. # # Location of encumbered binaries. -export ON_CLOSED_BINS="$CODEMGR_WS/closed" +export ON_CLOSED_BINS="/opt/onbld/closed" # REF_PROTO_LIST - for comparing the list of stuff in your proto area # with. Generally this should be left alone, since you want to see differences |