Print this page
12334 fix gcc4 build
12322 kdb: removal of unused dependency recommended
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>

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 2019, Joyent, Inc.
       31 +# Copyright 2020 Joyent, Inc.
  32   32  # Copyright 2019 RackTop Systems.
  33   33  #
  34   34  
  35   35  #
  36   36  # Makefile.master, global definitions for system source
  37   37  #
  38   38  ROOT=           /proto
  39   39  
  40   40  #
  41   41  # Adjunct root, containing an additional proto area to be used for headers
↓ open down ↓ 764 lines elided ↑ open up ↑
 806  806  COMPILE64.b=    $(ELFWRAP) $(ELFWRAP_FLAGS$(CLASS))
 807  807  
 808  808  CLASSPATH=      .
 809  809  COMPILE.java=   $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH)
 810  810  
 811  811  #
 812  812  # Link time macros
 813  813  #
 814  814  CCNEEDED                = -lC
 815  815  CCEXTNEEDED             = -lCrun -lCstd
      816 +NATIVECCNEEDED          = -lC
 816  817  $(__GNUC)CCNEEDED       = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
 817  818  $(__GNUC)CCEXTNEEDED    = $(CCNEEDED)
      819 +$(__GNUC)NATIVECCNEEDED = -R$(GCCLIBDIR) -L$(GCCLIBDIR) -lstdc++ -lgcc_s
 818  820  
 819  821  CCNEEDED64              = -lCrun
 820  822  CCEXTNEEDED64           = -lCrun -lCstd
      823 +NATIVECCNEEDED64        = -lCrun
 821  824  $(__GNUC64)CCNEEDED64   = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
      825 +$(__GNUC64)NATIVECCNEEDED64 = -R$(GCCLIBDIR) -L$(GCCLIBDIR) -lstdc++ -lgcc_s
 822  826  $(__GNUC64)CCEXTNEEDED  = $(CCNEEDED64)
 823  827  
 824  828  # Libraries we expect to use natively on the build machine
 825  829  NATIVE_LIBS=
 826  830  
 827  831  LDCHECKS                = $(ZASSERTDEFLIB) $(ZGUIDANCE) $(ZFATALWARNINGS)
 828  832  LDCHECKS                += $(NATIVE_LIBS:%=$(ZASSERTDEFLIB)=%)
 829  833  
 830  834  LINK.c=                 $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDCHECKS)
 831  835  LINK64.c=               $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) $(LDCHECKS)
↓ open down ↓ 475 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX