Print this page
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/sd/Makefile
          +++ new/usr/src/uts/intel/sd/Makefile
↓ open down ↓ 130 lines elided ↑ open up ↑
 131  131  #
 132  132  # Note that in warlock_with_{esp,isp} it is important to load sd.ll
 133  133  # before {isp,esp}.ll; the reason is that both have _init/_info/_fini
 134  134  # and warlock can only handle one extern function by a given name;
 135  135  # any loaded after the first are ignored.
 136  136  
 137  137  SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 138  138  CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
 139  139  
 140  140  WARLOCK_TARGETS = warlock_alone
 141      -$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_mpt warlock_with_glm
 142  141  
 143  142  warlock: $(WARLOCK_TARGETS)
 144  143  
 145  144  warlock_alone: $(WARLOCK_OK)
 146  145  
 147  146  $(WARLOCK_OK):  $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \
 148  147          warlock_ddi.files cmlb_files
 149  148          $(WARLOCK) -c $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
 150  149                  $(CMLB_FILES) \
 151  150                  -l ../warlock/ddi_dki_impl.ll
 152  151          $(TOUCH) $@
 153  152  
 154  153  %.ll: $(UTSBASE)/common/io/scsi/targets/%.c
 155  154          $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
 156  155  
 157      -warlock_with_glm: $(WLCMD_DIR)/sd_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
 158      -        glm_files warlock_ddi.files cmlb_files
 159      -        $(WARLOCK) -c $(WLCMD_DIR)/sd_with_glm.wlcmd \
 160      -                $(WARLOCK_OUT) \
 161      -                $(CLOSED)/uts/intel/glm/*.ll \
 162      -                 $(SCSI_FILES) $(CMLB_FILES) \
 163      -                -l ../warlock/ddi_dki_impl.ll
 164      -
 165      -warlock_with_mpt: $(WLCMD_DIR)/sd_with_mpt.wlcmd $(WARLOCK_OUT) scsi_files \
 166      -        mpt_files warlock_ddi.files cmlb_files
 167      -        $(WARLOCK) -c $(WLCMD_DIR)/sd_with_mpt.wlcmd \
 168      -                $(WARLOCK_OUT) \
 169      -                $(CLOSED)/uts/intel/mpt/*.ll \
 170      -                $(SCSI_FILES) $(CMLB_FILES) \
 171      -                -l ../warlock/ddi_dki_impl.ll
 172      -
 173      -glm_files:
 174      -        @cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
 175      -
 176      -mpt_files:
 177      -        @cd $(CLOSED)/uts/intel/mpt; pwd; $(MAKE) warlock
 178      -
 179  156  cmlb_files:
 180  157          @cd ../cmlb; pwd; $(MAKE) warlock
 181  158  
 182  159  scsi_files:
 183  160          @cd ../scsi; pwd; $(MAKE) warlock
 184  161  
 185  162  warlock_ddi.files:
 186  163          @cd ../warlock; pwd; $(MAKE) warlock
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX