Mercurial > illumos > git > illumos-omnios
changeset 21497:dd4db089303c
Merge pull request #498 from citrus-it/gcc7
Update template files for switch to gcc7 primary
| author | Dominik Hassler <hadfl@omniosce.org> |
|---|---|
| date | Mon, 17 Jun 2019 17:20:41 +0200 |
| parents | 80001d779f72 (current diff) c4ed0980aecd (diff) |
| children | 1e16d8ca3768 66b837a7261d |
| files | |
| diffstat | 3 files changed, 30 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Thu Jun 13 10:53:23 2019 +0200 +++ b/usr/src/Makefile.master Mon Jun 17 17:20:41 2019 +0200 @@ -28,7 +28,7 @@ # Copyright 2015 Gary Mills # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # Copyright (c) 2019, Joyent, Inc. # @@ -139,7 +139,7 @@ BUILDPY2= $(POUND_SIGN) BUILDPY2TOOLS= $(POUND_SIGN) -GNUC_ROOT= /opt/gcc/4.4.4 +GNUC_ROOT= /opt/gcc-7 GCCLIBDIR= $(GNUC_ROOT)/lib GCCLIBDIR64= $(GNUC_ROOT)/lib/$(MACH64) @@ -858,9 +858,9 @@ 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 %)
--- a/usr/src/tools/env/omnios-illumos-gate.sh Thu Jun 13 10:53:23 2019 +0200 +++ b/usr/src/tools/env/omnios-illumos-gate.sh Mon Jun 17 17:20:41 2019 +0200 @@ -292,14 +292,22 @@ export BUILDPY3TOOLS= export TOOLS_PYTHON=/usr/bin/python3.5 -export GNUC_ROOT=/opt/gcc-4.4.4/ +export GNUC_ROOT=/opt/gcc-7/ export ON_CLOSED_BINS=/opt/onbld/closed export __GNUC= -export PRIMARY_CC=gcc4,/opt/gcc-4.4.4/bin/gcc,gnu -export PRIMARY_CCC=gcc4,/opt/gcc-4.4.4/bin/g++,gnu -export SHADOW_CCS=gcc7,/opt/gcc-7/bin/gcc,gnu -export SHADOW_CCCS=gcc7,/opt/gcc-7/bin/g++,gnu +export PRIMARY_CC=gcc7,/opt/gcc-7/bin/gcc,gnu +export PRIMARY_CCC=gcc7,/opt/gcc-7/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 the following line to enable smatch. +# export ENABLE_SMATCH=yes +if [ -n "$ENABLE_SMATCH" ]; then + SMATCHBIN=$CODEMGR_WS$PARENT_TOOLS_ROOT/opt/onbld/bin/$MACH/smatch + export SMATCHBIN + SHADOW_CCS+=" smatch,$SMATCHBIN,smatch" +fi export ONNV_BUILDNUM=`grep '^VERSION=r' /etc/os-release | cut -c10-15` export PKGVERS_BRANCH=$ONNV_BUILDNUM.0
--- a/usr/src/tools/env/omnios-illumos-omnios.sh Thu Jun 13 10:53:23 2019 +0200 +++ b/usr/src/tools/env/omnios-illumos-omnios.sh Mon Jun 17 17:20:41 2019 +0200 @@ -277,17 +277,22 @@ ###################################################################### # OmniOS-specific overrides -export GNUC_ROOT=/opt/gcc-4.4.4/ -export SPRO_ROOT=/opt/sunstudio12.1 -export SPRO_VROOT="$SPRO_ROOT" -export ONLY_LINT_DEFS="-I${SPRO_ROOT}/sunstudio12.1/prod/include/lint" +export GNUC_ROOT=/opt/gcc-7/ export ON_CLOSED_BINS=/opt/onbld/closed export __GNUC= -export PRIMARY_CC=gcc4,/opt/gcc-4.4.4/bin/gcc,gnu -export PRIMARY_CCC=gcc4,/opt/gcc-4.4.4/bin/g++,gnu -export SHADOW_CCS=gcc7,/opt/gcc-7/bin/gcc,gnu -export SHADOW_CCCS=gcc7,/opt/gcc-7/bin/g++,gnu +export PRIMARY_CC=gcc7,/opt/gcc-7/bin/gcc,gnu +export PRIMARY_CCC=gcc7,/opt/gcc-7/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 the following line to enable smatch. +# export ENABLE_SMATCH=yes +if [ -n "$ENABLE_SMATCH" ]; then + SMATCHBIN=$CODEMGR_WS$PARENT_TOOLS_ROOT/opt/onbld/bin/$MACH/smatch + export SMATCHBIN + SHADOW_CCS+=" smatch,$SMATCHBIN,smatch" +fi _branch=`git -C $CODEMGR_WS rev-parse --abbrev-ref HEAD` _hash=`git -C $CODEMGR_WS rev-parse --short HEAD`