diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-10-14 10:41:49 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-10-14 10:41:49 -0400 |
| commit | 0a46b0930458a57b96555bb3bb65c716896432bd (patch) | |
| tree | b8a4cec993e27e7927d6c52c50ff36948cea9b23 /usr/src/tools/env | |
| parent | 28368080c1944448ddbf4bbf4f8a4a6afc73b824 (diff) | |
| parent | 5a493f9b6da15815fc84f6f10e1a800f0dc59813 (diff) | |
| download | illumos-joyent-0a46b0930458a57b96555bb3bb65c716896432bd.tar.gz | |
[illumos-gate merge]
commit 5a493f9b6da15815fc84f6f10e1a800f0dc59813
14105 ar -s could work on its own
commit a190135a5de9f6c93d19ec7b3ee608084be06b1a
14149 Use gcc10 as the shadow compiler
14150 illumos.sh should point to default closed bins
Diffstat (limited to 'usr/src/tools/env')
| -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 a8c587d072..73583402ab 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 |