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/intel/genunix/Makefile
          +++ new/usr/src/uts/intel/genunix/Makefile
↓ open down ↓ 64 lines elided ↑ open up ↑
  65   65  LINT_TARGET     = $(MODULE).lint
  66   66  INSTALL_TARGET  = $(GENUNIX) $(ROOTMODULE)
  67   67  
  68   68  #
  69   69  #       Overrides
  70   70  #
  71   71  CLOBBERFILES    += $(GENUNIX)
  72   72  CLEANFILES      += $(LIBSTUBS) $(LIBGEN)
  73   73  BINARY          =
  74   74  
  75      -#
  76      -# Non-patch genunix builds merge a version of the ip module called ipctf.  This
  77      -# is to ensure that the common network-related types are included in genunix and
  78      -# can thus be uniquified out of other modules.  We don't want to do this for
  79      -# patch builds, since we can't guarantee that ip and genunix will be in the same
  80      -# patch.
  81      -#
  82      -IPCTF_TARGET    = $(IPCTF)
  83      -$(PATCH_BUILD)IPCTF_TARGET =
  84      -
  85   75  CPPFLAGS        += -I$(SRC)/common
  86   76  CPPFLAGS        += -I$(SRC)/uts/common/fs/zfs
  87   77  
  88   78  CPPFLAGS        += -I$(UTSBASE)/i86pc
  89   79  
  90   80  #
  91   81  # For now, disable these lint checks; maintainers should endeavor
  92   82  # to investigate and remove these for maximum lint coverage.
  93   83  # Please do not carry these forward to new Makefiles.
  94   84  #
↓ open down ↓ 38 lines elided ↑ open up ↑
 133  123  
 134  124  modlintlib:     $(MODLINTLIB_DEPS)
 135  125  
 136  126  clean.lint:     $(CLEAN_LINT_DEPS)
 137  127  
 138  128  install:        $(INSTALL_DEPS)
 139  129  
 140  130  $(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
 141  131          $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
 142  132  
 143      -$(IPCTF_TARGET) ipctf_target: FRC
 144      -        @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR)
 145      -        @pwd
 146      -
 147      -$(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
      133 +$(GENUNIX): $(OBJECTS)
 148  134          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
 149      -        $(CTFMERGE_GENUNIX_MERGE)
      135 +        $(CTFMERGE_MODULE)
 150  136          $(POST_PROCESS)
 151  137  
 152  138  #
 153  139  #       Include common targets.
 154  140  #
 155  141  include $(UTSBASE)/intel/Makefile.targ
 156  142  
 157  143  #
 158  144  #       Software workarounds for hardware "features".
 159  145  #
 160  146  include $(UTSBASE)/i86pc/Makefile.workarounds
 161  147  
 162  148  ALL_DEFS += $(WORKAROUND_DEFS)
 163  149  
 164  150  #
 165  151  # Override.
 166  152  #
 167  153  $(MODULE).lint := GEN_LINT_LIB =
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX