Print this page
1961 investigate stopping uniquifying CTF information
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/sun4v/genunix/Makefile
          +++ new/usr/src/uts/sun4v/genunix/Makefile
↓ open down ↓ 79 lines elided ↑ open up ↑
  80   80  CLEANFILES      += $(LIBSTUBS) $(LIBGEN)
  81   81  
  82   82  LINT_LIB_DIR    = $(UTSBASE)/$(PLATFORM)/lint-libs/$(OBJS_DIR)
  83   83  LINT_LIB        = $(LINT_LIB_DIR)/llib-lunix.ln
  84   84  GEN_LINT_LIB    =
  85   85  
  86   86  BINARY          =
  87   87  
  88   88  CLOBBERFILES    += $(GENUNIX)
  89   89  
  90      -#
  91      -# Non-patch genunix builds merge a version of the ip module called ipctf.  This
  92      -# is to ensure that the common network-related types are included in genunix and
  93      -# can thus be uniquified out of other modules.  We don't want to do this for
  94      -# patch builds, since we can't guarantee that ip and genunix will be in the same
  95      -# patch.
  96      -#
  97      -IPCTF_TARGET    = $(IPCTF)
  98      -$(PATCH_BUILD)IPCTF_TARGET =
  99      -
 100   90  # 
 101   91  # lint pass one enforcement 
 102   92  # 
 103   93  CFLAGS += $(CCVERBOSE)
 104   94  CPPFLAGS += -I$(SRC)/common
 105   95  CPPFLAGS += -I$(SRC)/uts/common/fs/zfs
 106   96  
 107   97  INC_PATH +=  -I$(UTSBASE)/sun4
 108   98  
 109   99  #
↓ open down ↓ 44 lines elided ↑ open up ↑
 154  144  
 155  145  modlintlib:     $(MODLINTLIB_DEPS)
 156  146  
 157  147  clean.lint:     $(CLEAN_LINT_DEPS)
 158  148  
 159  149  install:        $(INSTALL_DEPS)
 160  150  
 161  151  $(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
 162  152          $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
 163  153  
 164      -$(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
      154 +$(GENUNIX): $(OBJECTS)
 165  155          @pwd
 166  156          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
 167      -        $(CTFMERGE_GENUNIX_MERGE)
      157 +        $(CTFMERGE_MODULE)
 168  158          $(POST_PROCESS)
 169  159  
 170  160  $(OBJECTS): $(OBJS_DIR)
 171  161  
 172  162  #
 173  163  #       Include common targets.
 174  164  #
 175  165  include $(UTSBASE)/sparc/Makefile.targ
 176  166  
 177  167  #
 178  168  #       Include workarounds.
 179  169  #
 180  170  include $(UTSBASE)/$(PLATFORM)/Makefile.workarounds
 181  171  
 182  172  ALL_DEFS +=     $(WORKAROUND_DEFS)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX