Print this page
9852 enable ld(1) guidance and deflib assertions for the illumos build

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/rcm_daemon/Makefile.com
          +++ new/usr/src/cmd/rcm_daemon/Makefile.com
↓ open down ↓ 121 lines elided ↑ open up ↑
 122  122  CERRWARN += -_gcc=-Wno-parentheses
 123  123  CERRWARN += -_gcc=-Wno-unused-label
 124  124  CERRWARN += -_gcc=-Wno-uninitialized
 125  125  CERRWARN += -_gcc=-Wno-unused-function
 126  126  
 127  127  MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
 128  128  rcm_daemon := LDFLAGS += $(MAPFILES:%=-M%)
 129  129  
 130  130  LINTFLAGS += -u -erroff=E_FUNC_ARG_UNUSED
 131  131  
 132      -LDLIBS_MODULES =
 133      -SUNW_pool_rcm.so := LDLIBS_MODULES += -L$(ROOT)/usr/lib -lpool
 134      -SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
 135      -SUNW_vlan_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
 136      -SUNW_vnic_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
 137      -SUNW_ibpart_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
 138      -SUNW_aggr_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
 139      -SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -ldladm -lipmp -lipadm
 140      -SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil
 141      -SUNW_bridge_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -ldladm
      132 +#
      133 +# All of the module plugins leverage the LDLIBS_MODULES, but not LDLIBS. As such
      134 +# we define a base set for all modules that we know they need due to -zguidance
      135 +# and only append extra libraries that individual modules need.
      136 +#
      137 +LDLIBS_MODULES = -L$(ROOT)/lib -L$(ROOT)/usr/lib -lc -lrcm
      138 +SUNW_pool_rcm.so := LDLIBS_MODULES += -lpool -lnvpair
      139 +SUNW_svm_rcm.so := LDLIBS_MODULES += -lmeta
      140 +SUNW_network_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair -ldevinfo
      141 +SUNW_vlan_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
      142 +SUNW_vnic_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
      143 +SUNW_ibpart_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
      144 +SUNW_aggr_rcm.so := LDLIBS_MODULES +=  -ldladm -lnvpair
      145 +SUNW_ip_rcm.so := LDLIBS_MODULES += -linetutil -ldladm -lipmp -lipadm -lnvpair \
      146 +                                    -lgen -lsocket
      147 +SUNW_ip_anon_rcm.so := LDLIBS_MODULES +=  -linetutil -lnsl
      148 +SUNW_bridge_rcm.so := LDLIBS_MODULES += -ldladm -lnvpair
      149 +SUNW_mpxio_rcm.so := LDLIBS_MODULES += -ldevinfo
 142  150  
 143      -LDLIBS += -lgen -lelf -lrcm -lnvpair -ldevinfo -lnsl -lsocket
      151 +LDLIBS += -lrcm -lnvpair
 144  152  
 145  153  SRCS = $(RCM_SRC) $(COMMON_MOD_SRC)
 146  154  
 147  155  POFILES = $(SRCS:.c=.po)
 148  156  POFILE = prcm_daemon.po
 149  157  
 150  158  PERL_SCRIPTS = $(COMMON_PERL_SRC) $($(MACH)_PERL_SCRIPT_SRC)
 151  159  SHELL_SCRIPTS = $(COMMON_SHELL_SCRIPT_SRC)
 152  160  RCM_SCRIPTS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
 153  161  
↓ open down ↓ 85 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX