summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/Makefile.rules
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-09-19 03:26:53 -0700
committerJohn Levon <john.levon@joyent.com>2019-10-09 08:32:27 -0700
commit06abc743fea52d63ff21197e28e32fe2aa5b402a (patch)
tree005f9f2ae7c1d54057a16029361ed584fc02bd73 /usr/src/uts/common/Makefile.rules
parent160df5799e3f9b7bb50684728c35ab9849ff694c (diff)
downloadillumos-joyent-06abc743fea52d63ff21197e28e32fe2aa5b402a.tar.gz
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> Reviewed by: Robert Mustacchi <rm@fingolfin.org> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/Makefile.rules')
-rw-r--r--usr/src/uts/common/Makefile.rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules
index 688faf0000..2ab56e0245 100644
--- a/usr/src/uts/common/Makefile.rules
+++ b/usr/src/uts/common/Makefile.rules
@@ -1613,7 +1613,7 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/common/zmod/%.c
$(OBJS_DIR)/zlib_obj.o: $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
$(LD) -r -Breduce -M$(UTSBASE)/common/zmod/mapfile -o $@ \
$(ZLIB_OBJS:%=$(OBJS_DIR)/%)
- $(CTFMERGE) -t -f -L VERSION -o $@ $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
+ $(CTFMERGE) $(CTFMRGFLAGS) -o $@ $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
$(OBJS_DIR)/%.o: $(UTSBASE)/common/io/hxge/%.c
$(COMPILE.c) -o $@ $<