Print this page
8411 Build should warn when linking against libraries outside proto area

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/boot/bootadm/Makefile
          +++ new/usr/src/cmd/boot/bootadm/Makefile
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright 2016 Toomas Soome <tsoome@me.com>
  26   26  # Copyright 2016 Nexenta Systems, Inc.
       27 +# Copyright 2017 RackTop Systems.
  27   28  #
  28   29  
  29   30  PROG= bootadm
  30   31  
  31   32  SBINLINKS= $(PROG)
  32   33  
  33   34  OBJS= bootadm.o bootadm_upgrade.o bootadm_hyper.o bootadm_digest.o \
  34   35          bootadm_loader.o
  35   36  SRCS = $(OBJS:.o=.c)
  36   37  POFILES= $(OBJS:%.o=%.po)
↓ open down ↓ 1 lines elided ↑ open up ↑
  38   39  include ../Makefile.com
  39   40  
  40   41  POFILE= bootadm_cmd.po
  41   42  
  42   43  .KEEP_STATE:
  43   44  
  44   45  LDLIBS_i386= -lfdisk
  45   46  LDLIBS += -lficl-sys -lmd -lcryptoutil -lnvpair -lgen -ladm -lefi
  46   47  LDLIBS += -lz -lbe -lzfs -lofmt $(LDLIBS_$(MACH))
  47   48  
       49 +# Allow zlib to be taken from outside the proto area.
       50 +$(ADJUNCT_PROTO_NOT_SET)LDFLAGS += $(ZASSERTDEFLIB)=libz.so
       51 +
  48   52  # Writing into string literals is incorrect.  We need to match gcc's
  49   53  # behavior, which causes us to take SIGSEGV on such a write.
  50   54  CFLAGS +=       $(XSTRCONST)
  51   55  CPPFLAGS +=     -D_FILE_OFFSET_BITS=64
  52   56  CPPFLAGS +=     -I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl
  53   57  
  54   58  C99MODE=        $(C99_ENABLE)
  55   59  
  56   60  LINTFLAGS += -erroff=E_INCONS_ARG_DECL2
  57   61  LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2
↓ open down ↓ 20 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX