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/sun4u/genunix/Makefile
          +++ new/usr/src/uts/sun4u/genunix/Makefile
↓ open down ↓ 81 lines elided ↑ open up ↑
  82   82  #
  83   83  # Non-patch genunix builds merge a version of the ip module called ipctf.  This
  84   84  # is to ensure that the common network-related types are included in genunix and
  85   85  # can thus be uniquified out of other modules.  We don't want to do this for
  86   86  # patch builds, since we can't guarantee that ip and genunix will be in the same
  87   87  # patch.
  88   88  #
  89   89  IPCTF_TARGET    = $(IPCTF)
  90   90  $(PATCH_BUILD)IPCTF_TARGET =
  91   91  
  92      -# 
  93      -# lint pass one enforcement 
  94      -# 
       92 +#
       93 +# lint pass one enforcement
       94 +#
  95   95  CFLAGS += $(CCVERBOSE)
  96   96  CPPFLAGS += -I$(SRC)/common
  97   97  CPPFLAGS += -I$(SRC)/uts/common/fs/zfs
  98   98  
  99   99  INC_PATH +=  -I$(UTSBASE)/sun4
 100  100  
 101  101  #
 102  102  # For now, disable these lint checks; maintainers should endeavor
 103  103  # to investigate and remove these for maximum lint coverage.
 104  104  # Please do not carry these forward to new Makefiles.
↓ open down ↓ 35 lines elided ↑ open up ↑
 140  140  clean:          $(CLEAN_DEPS)
 141  141  
 142  142  clobber:        $(CLOBBER_DEPS)
 143  143  
 144  144  lint:           $(LINT_DEPS)
 145  145  
 146  146  modlintlib:     $(MODLINTLIB_DEPS)
 147  147  
 148  148  clean.lint:     $(CLEAN_LINT_DEPS)
 149  149  
 150      -install:        $(INSTALL_DEPS)
      150 +install:        $(INSTALL_DEPS)
 151  151  
 152  152  install_h:
 153  153  
 154  154  
 155      -$(LIBGEN):      $(GENUNIX) $(LIBSTUBS)
 156      -        $(BUILD.SO) $(GENUNIX) $(LIBSTUBS)
      155 +$(LIBGEN):      $(OBJECTS) $(LIBSTUBS)
      156 +        $(BUILD.SO) $(OBJECTS) $(LIBSTUBS)
 157  157  
 158  158  $(IPCTF_TARGET) ipctf_target: FRC
 159  159          @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR)
 160  160          @pwd
 161  161  
 162  162  $(GENUNIX): $(IPCTF_TARGET) $(OBJECTS)
 163  163          $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS)
 164  164          $(CTFMERGE_GENUNIX_MERGE)
 165  165          $(POST_PROCESS)
 166  166  
↓ open down ↓ 13 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX