Print this page
9996 use GCC 7 as default primary compiler

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 20 lines elided ↑ open up ↑
  21   21  
  22   22  #
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  26   26  # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
  27   27  # Copyright 2015 Gary Mills
  28   28  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
  29   29  # Copyright 2016 Toomas Soome <tsoome@me.com>
  30   30  # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
  31      -# Copyright (c) 2019, Joyent, Inc.
       31 +# Copyright 2019, Joyent, Inc.
  32   32  #
  33   33  
  34   34  #
  35   35  # Makefile.master, global definitions for system source
  36   36  #
  37   37  ROOT=           /proto
  38   38  
  39   39  #
  40   40  # Adjunct root, containing an additional proto area to be used for headers
  41   41  # and libraries.
↓ open down ↓ 77 lines elided ↑ open up ↑
 119  119  
 120  120  # define runtime JAVA_HOME, primarily for cmd/pools/poold
 121  121  JAVA_HOME=      /usr/java
 122  122  # define buildtime JAVA_ROOT
 123  123  JAVA_ROOT=      /usr/java
 124  124  # Build uses java7 by default.  Pass one the variables below set to empty
 125  125  # string in the environment to override.
 126  126  BLD_JAVA_6=     $(POUND_SIGN)
 127  127  BLD_JAVA_8=     $(POUND_SIGN)
 128  128  
 129      -GNUC_ROOT=      /opt/gcc/4.4.4
      129 +GNUC_ROOT=      /usr/gcc/7
 130  130  GCCLIBDIR=      $(GNUC_ROOT)/lib
 131  131  GCCLIBDIR64=    $(GNUC_ROOT)/lib/$(MACH64)
 132  132  
 133  133  DOCBOOK_XSL_ROOT=       /usr/share/sgml/docbook/xsl-stylesheets
 134  134  
 135  135  RPCGEN=         /usr/bin/rpcgen
 136  136  STABS=          $(ONBLD_TOOLS)/bin/$(MACH)/stabs
 137  137  ELFEXTRACT=     $(ONBLD_TOOLS)/bin/$(MACH)/elfextract
 138  138  MBH_PATCH=      $(ONBLD_TOOLS)/bin/$(MACH)/mbh_patch
 139  139  BTXLD=          $(ONBLD_TOOLS)/bin/$(MACH)/btxld
↓ open down ↓ 695 lines elided ↑ open up ↑
 835  835  # Define native compilation macros
 836  836  #
 837  837  
 838  838  # Base directory where compilers are loaded.
 839  839  # Defined here so it can be overridden by developer.
 840  840  #
 841  841  SPRO_ROOT=              $(BUILD_TOOLS)/SUNWspro
 842  842  SPRO_VROOT=             $(SPRO_ROOT)/SS12
 843  843  GNU_ROOT=               /usr
 844  844  
 845      -$(__GNUC)PRIMARY_CC=    gcc4,$(GNUC_ROOT)/bin/gcc,gnu
      845 +$(__GNUC)PRIMARY_CC=    gcc7,$(GNUC_ROOT)/bin/gcc,gnu
 846  846  $(__SUNC)PRIMARY_CC=    studio12,$(SPRO_VROOT)/bin/cc,sun
 847      -$(__GNUC)PRIMARY_CCC=   gcc4,$(GNUC_ROOT)/bin/g++,gnu
      847 +$(__GNUC)PRIMARY_CCC=   gcc7,$(GNUC_ROOT)/bin/g++,gnu
 848  848  $(__SUNC)PRIMARY_CCC=   studio12,$(SPRO_VROOT)/bin/CC,sun
 849  849  
 850  850  CW_CC_COMPILERS=        $(PRIMARY_CC:%=--primary %) $(SHADOW_CCS:%=--shadow %)
 851  851  CW_CCC_COMPILERS=       $(PRIMARY_CCC:%=--primary %) $(SHADOW_CCCS:%=--shadow %)
 852  852  
 853  853  
 854  854  # Till SS12u1 formally becomes the NV CBE, LINT is hard
 855  855  # coded to be picked up from the $SPRO_ROOT/sunstudio12.1/
 856  856  # location. Impacted variables are sparc_LINT, sparcv9_LINT,
 857  857  # i386_LINT, amd64_LINT.
↓ open down ↓ 398 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX