diff options
| -rw-r--r-- | usr/src/Makefile.master | 8 | ||||
| -rw-r--r-- | usr/src/tools/env/illumos.sh | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index fc7b94f315..11232d9c47 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -28,7 +28,7 @@ # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. -# Copyright (c) 2019, Joyent, Inc. +# Copyright 2019, Joyent, Inc. # # @@ -126,7 +126,7 @@ JAVA_ROOT= /usr/java BLD_JAVA_6= $(POUND_SIGN) BLD_JAVA_8= $(POUND_SIGN) -GNUC_ROOT= /opt/gcc/4.4.4 +GNUC_ROOT= /usr/gcc/7 GCCLIBDIR= $(GNUC_ROOT)/lib GCCLIBDIR64= $(GNUC_ROOT)/lib/$(MACH64) @@ -842,9 +842,9 @@ SPRO_ROOT= $(BUILD_TOOLS)/SUNWspro SPRO_VROOT= $(SPRO_ROOT)/SS12 GNU_ROOT= /usr -$(__GNUC)PRIMARY_CC= gcc4,$(GNUC_ROOT)/bin/gcc,gnu +$(__GNUC)PRIMARY_CC= gcc7,$(GNUC_ROOT)/bin/gcc,gnu $(__SUNC)PRIMARY_CC= studio12,$(SPRO_VROOT)/bin/cc,sun -$(__GNUC)PRIMARY_CCC= gcc4,$(GNUC_ROOT)/bin/g++,gnu +$(__GNUC)PRIMARY_CCC= gcc7,$(GNUC_ROOT)/bin/g++,gnu $(__SUNC)PRIMARY_CCC= studio12,$(SPRO_VROOT)/bin/CC,sun CW_CC_COMPILERS= $(PRIMARY_CC:%=--primary %) $(SHADOW_CCS:%=--shadow %) diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh index 6b9c01537e..41fe338c2c 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -23,7 +23,7 @@ # 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 (c) 2019, Joyent, Inc. +# Copyright 2019, Joyent, Inc. # # - This file is sourced by "bldenv.sh" and "nightly.sh" and should not # be executed directly. @@ -78,8 +78,11 @@ export CODEMGR_WS="`git rev-parse --show-toplevel`" # # 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 +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 SHADOW_CCS=gcc4,/opt/gcc/4.4.4/bin/gcc,gnu +export SHADOW_CCCS=gcc4,/opt/gcc/4.4.4/bin/g++,gnu # uncomment to enable smatch #export ENABLE_SMATCH=1 |