diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-07-19 10:38:08 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-07-24 15:30:49 +0000 |
| commit | 8d139918615e6135f7dc0f8ee1417c30ab562d12 (patch) | |
| tree | 3aee5640566f4a2463da071a7649be5e6f148f52 /usr/src/tools | |
| parent | b55a30d7f192ccc3e815772ffcd83bec669ae7a7 (diff) | |
| download | illumos-joyent-8d139918615e6135f7dc0f8ee1417c30ab562d12.tar.gz | |
11482 Primary compiler is not set properly in illumos.sh
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Rich Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/tools')
| -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 bfe615a8b9..ca28e3f617 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -22,7 +22,7 @@ # Copyright 2015 Nexenta Systems, Inc. All rights reserved. # Copyright 2012 Joshua M. Clulow <josh@sysmgr.org> # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # Copyright 2019, Joyent, Inc. # # - This file is sourced by "bldenv.sh" and "nightly.sh" and should not @@ -79,8 +79,8 @@ export CODEMGR_WS="`git rev-parse --show-toplevel`" # To disable shadow compilation, unset SHADOW_* or set them to the empty string. # export GNUC_ROOT=/usr/gcc/7 -export PRIMARY_CCS=gcc7,$GNUC_ROOT/bin/gcc,gnu -export PRIMARY_CCCS=gcc7,$GNUC_ROOT/bin/g++,gnu +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 |