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/sun4u/genunix/Makefile
          +++ new/usr/src/uts/sun4u/genunix/Makefile
↓ open down ↓ 71 lines elided ↑ open up ↑
  72   72  CLEANFILES      += $(LIBSTUBS) $(LIBGEN)
  73   73  
  74   74  LINT_LIB_DIR    = $(UTSBASE)/$(PLATFORM)/lint-libs/$(OBJS_DIR)
  75   75  LINT_LIB        = $(LINT_LIB_DIR)/llib-lunix.ln
  76   76  GEN_LINT_LIB    =
  77   77  
  78   78  BINARY          =
  79   79  
  80   80  CLOBBERFILES    += $(GENUNIX)
  81   81  
  82      -#
  83      -# Non-patch genunix builds merge a version of the ip module called ipctf.  This
  84      -# is to ensure that the common network-related types are included in genunix and
  85      -# can thus be uniquified out of other modules.  We don't want to do this for
  86      -# patch builds, since we can't guarantee that ip and genunix will be in the same
  87      -# patch.
  88      -#
  89      -IPCTF_TARGET    = $(IPCTF)
  90      -$(PATCH_BUILD)IPCTF_TARGET =
  91      -
  92   82  # 
  93   83  # lint pass one enforcement 
  94   84  # 
  95   85  CFLAGS += $(CCVERBOSE)
  96   86  CPPFLAGS += -I$(SRC)/common
  97   87  CPPFLAGS += -I$(SRC)/uts/common/fs/zfs
  98   88  
  99   89  INC_PATH +=  -I$(UTSBASE)/sun4
 100   90  
 101   91  #
↓ open down ↓ 46 lines elided ↑ open up ↑
 148  138  clean.lint:     $(CLEAN_LINT_DEPS)
 149  139  
 150  140  install:        $(INSTALL_DEPS)
 151  141  
 152  142  install_h:
 153  143  
 154  144  
 155  145  $(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
 156  146          $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
 157  147  
 158      -$(IPCTF_TARGET) ipctf_target: FRC
 159      -        @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR)
 160      -        @pwd
 161      -
 162      -$(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
      148 +$(GENUNIX): $(OBJECTS)
 163  149          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
 164      -        $(CTFMERGE_GENUNIX_MERGE)
      150 +        $(CTFMERGE_MODULE)
 165  151          $(POST_PROCESS)
 166  152  
 167  153  $(OBJECTS): $(OBJS_DIR)
 168  154  
 169  155  #
 170  156  #       Include common targets.
 171  157  #
 172  158  include $(UTSBASE)/sparc/Makefile.targ
 173  159  
 174  160  #
 175  161  #       Include sun4u workarounds.
 176  162  #
 177  163  include $(UTSBASE)/sun4u/Makefile.workarounds
 178  164  
 179  165  ALL_DEFS +=     $(WORKAROUND_DEFS)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX