Print this page
11736 Stop using $VERSION for the genunix label
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Toomas Soome <tsoome@me.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/Makefile.rules
          +++ new/usr/src/uts/common/Makefile.rules
↓ open down ↓ 1600 lines elided ↑ open up ↑
1601 1601          $(COMPILE.c) -o $@ $<
1602 1602          $(CTFCONVERT_O)
1603 1603  
1604 1604  $(OBJS_DIR)/%.o:                $(UTSBASE)/common/zmod/%.c
1605 1605          $(COMPILE.c) -o $@ $<
1606 1606          $(CTFCONVERT_O)
1607 1607  
1608 1608  $(OBJS_DIR)/zlib_obj.o:         $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
1609 1609          $(LD) -r -Breduce -M$(UTSBASE)/common/zmod/mapfile -o $@ \
1610 1610              $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
1611      -        $(CTFMERGE) -t -f -L VERSION -o $@ $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
     1611 +        $(CTFMERGE) $(CTFMRGFLAGS) -o $@ $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
1612 1612  
1613 1613  $(OBJS_DIR)/%.o:                $(UTSBASE)/common/io/hxge/%.c
1614 1614          $(COMPILE.c) -o $@ $<
1615 1615          $(CTFCONVERT_O)
1616 1616  
1617 1617  $(OBJS_DIR)/%.o:                $(UTSBASE)/common/io/tpm/%.c
1618 1618          $(COMPILE.c) -o $@ $<
1619 1619          $(CTFCONVERT_O)
1620 1620  
1621 1621  $(OBJS_DIR)/%.o:                $(UTSBASE)/common/io/tpm/%.s
↓ open down ↓ 1151 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX