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

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libzfs/Makefile.com
          +++ new/usr/src/lib/libzfs/Makefile.com
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
  24   24  # Copyright (c) 2011, 2016 by Delphix. All rights reserved.
       25 +# Copyright 2017 RackTop Systems.
  25   26  #
  26   27  
  27   28  LIBRARY= libzfs.a
  28   29  VERS= .1
  29   30  
  30   31  OBJS_SHARED=                    \
  31   32          zfeature_common.o       \
  32   33          zfs_comutil.o           \
  33   34          zfs_deleg.o             \
  34   35          zfs_fletcher.o          \
↓ open down ↓ 35 lines elided ↑ open up ↑
  70   71  C99MODE=        -xc99=%all
  71   72  C99LMODE=       -Xc99=%all
  72   73  LDLIBS +=       -lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \
  73   74          -ladm -lidmap -ltsol -lmd -lumem -lzfs_core
  74   75  CPPFLAGS +=     $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT
  75   76  $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
  76   77  
  77   78  # There's no lint library for zlib, so only include this when building
  78   79  $(DYNLIB) := LDLIBS +=  -lz
  79   80  
       81 +# Allow zlib to be taken from outside the proto area.
       82 +$(ADJUNCT_PROTO_NOT_SET)DYNFLAGS += $(ZASSERTDEFLIB)=libz.so
       83 +
  80   84  LINTFLAGS +=    -erroff=E_STATIC_UNUSED
  81   85  LINTFLAGS64 +=  -erroff=E_STATIC_UNUSED
  82   86  
  83   87  SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)        \
  84   88          $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c)
  85   89  $(LINTLIB) := SRCS=     $(SRCDIR)/$(LINTSRC)
  86   90  
  87   91  .KEEP_STATE:
  88   92  
  89   93  all: $(LIBS)
  90   94  
  91   95  lint: lintcheck
  92   96  
  93   97  pics/%.o: ../../../common/zfs/%.c
  94   98          $(COMPILE.c) -o $@ $<
  95   99          $(POST_PROCESS_O)
  96  100  
  97  101  include ../../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX