Print this page
10593 illumos build should not use kernel modules as link-editor input

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/sun4v/genunix/Makefile
          +++ new/usr/src/uts/sun4v/genunix/Makefile
↓ open down ↓ 89 lines elided ↑ open up ↑
  90   90  #
  91   91  # Non-patch genunix builds merge a version of the ip module called ipctf.  This
  92   92  # is to ensure that the common network-related types are included in genunix and
  93   93  # can thus be uniquified out of other modules.  We don't want to do this for
  94   94  # patch builds, since we can't guarantee that ip and genunix will be in the same
  95   95  # patch.
  96   96  #
  97   97  IPCTF_TARGET    = $(IPCTF)
  98   98  $(PATCH_BUILD)IPCTF_TARGET =
  99   99  
 100      -# 
 101      -# lint pass one enforcement 
 102      -# 
      100 +#
      101 +# lint pass one enforcement
      102 +#
 103  103  CFLAGS += $(CCVERBOSE)
 104  104  CPPFLAGS += -I$(SRC)/common
 105  105  CPPFLAGS += -I$(SRC)/uts/common/fs/zfs
 106  106  
 107  107  INC_PATH +=  -I$(UTSBASE)/sun4
 108  108  
 109  109  #
 110  110  # For now, disable these lint checks; maintainers should endeavor
 111  111  # to investigate and remove these for maximum lint coverage.
 112  112  # Please do not carry these forward to new Makefiles.
↓ open down ↓ 36 lines elided ↑ open up ↑
 149  149  clean:          $(CLEAN_DEPS)
 150  150  
 151  151  clobber:        $(CLOBBER_DEPS)
 152  152  
 153  153  lint:           $(LINT_DEPS)
 154  154  
 155  155  modlintlib:     $(MODLINTLIB_DEPS)
 156  156  
 157  157  clean.lint:     $(CLEAN_LINT_DEPS)
 158  158  
 159      -install:        $(INSTALL_DEPS)
      159 +install:        $(INSTALL_DEPS)
 160  160  
 161      -$(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
 162      -        $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
      161 +$(LIBGEN):      $(OBJECTS) $(LIBSTUBS)
      162 +        $(BUILD.SO) $(OBJECTS) $(LIBSTUBS)
 163  163  
 164  164  $(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
 165  165          @pwd
 166  166          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
 167  167          $(CTFMERGE_GENUNIX_MERGE)
 168  168          $(POST_PROCESS)
 169  169  
 170  170  $(OBJECTS): $(OBJS_DIR)
 171  171  
 172  172  #
 173  173  #       Include common targets.
 174  174  #
 175  175  include $(UTSBASE)/sparc/Makefile.targ
 176  176  
 177  177  #
 178  178  #       Include workarounds.
 179  179  #
 180  180  include $(UTSBASE)/$(PLATFORM)/Makefile.workarounds
 181  181  
 182  182  ALL_DEFS +=     $(WORKAROUND_DEFS)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX