diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-07-25 11:37:10 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-07-25 11:37:10 +0000 |
| commit | cc6c88bea3292da402331c560e619ecaaef8e669 (patch) | |
| tree | 99084ca14b0eb198166507966fa5ed3c18581653 /usr/src/tools | |
| parent | d0efab8443fcce33c336a009d253617419db9909 (diff) | |
| parent | 8d139918615e6135f7dc0f8ee1417c30ab562d12 (diff) | |
| download | illumos-joyent-cc6c88bea3292da402331c560e619ecaaef8e669.tar.gz | |
[illumos-gate merge]
commit 8d139918615e6135f7dc0f8ee1417c30ab562d12
11482 Primary compiler is not set properly in illumos.sh
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 fd687390d2..1b2987f5eb 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 |