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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/volrmmount/Makefile
          +++ new/usr/src/cmd/volrmmount/Makefile
↓ 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 2006 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
       25 +# Copyright 2017 RackTop Systems.
       26 +#
  25   27  
  26   28  PROG =          volrmmount
  27   29  LOCAL_OBJS =    volrmmount.o
  28   30  RMVOLMGR_OBJS = rmm_common.o vold.o
  29   31  OBJS =          $(LOCAL_OBJS) $(RMVOLMGR_OBJS)
  30   32  LOCAL_SRCS =    $(LOCAL_OBJS:%.o=%.c)
  31   33  RMVOLGMR_SRCS = $(RMVOLMGR_OBJS:%.o=$(SRC)/cmd/rmvolmgr/%.c)
  32   34  SRCS =          $(LOCAL_SRCS) $(RMVOLMGR_SRCS)
  33   35  
  34   36  include $(SRC)/cmd/Makefile.cmd
  35   37  include $(SRC)/cmd/hal/Makefile.hal
  36   38  
  37   39  LDLIBS +=       -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lhal -lhal-storage -lcontract
  38   40  
       41 +# Allow volrmmount to take some of its dependencies from outside the proto area.
       42 +$(ADJUNCT_PROTO_NOT_SET)LDFLAGS += $(ZASSERTDEFLIB)=libdbus-1.so
       43 +$(ADJUNCT_PROTO_NOT_SET)LDFLAGS += $(ZASSERTDEFLIB)=libdbus-glib-1.so
       44 +$(ADJUNCT_PROTO_NOT_SET)LDFLAGS += $(ZASSERTDEFLIB)=libglib-2.0.so
       45 +
  39   46  CPPFLAGS +=     $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS)
  40   47  CPPFLAGS +=     -I$(ROOT)/usr/include/hal
  41   48  CPPFLAGS +=     -I$(SRC)/cmd/rmvolmgr
  42   49  C99MODE =       $(C99_ENABLE)
  43   50  
  44   51  CERRWARN +=     -_gcc=-Wno-switch
  45   52  CERRWARN +=     -_gcc=-Wno-unused-variable
  46   53  CERRWARN +=     -_gcc=-Wno-parentheses
  47   54  CERRWARN +=     -_gcc=-Wno-uninitialized
  48   55  CERRWARN +=     -_gcc=-Wno-unused-function
↓ open down ↓ 23 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX