From 18425b359c7d1e5f7f63fae3ca5245407223a45b Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Tue, 18 Feb 2020 09:37:16 +0200 Subject: 12318 build zpool command as 64-bit binary Reviewed by: Andrew Stormont Reviewed by: Dan McDonald Reviewed by: Marcel Telka Approved by: Robert Mustacchi --- usr/src/cmd/zpool/Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/usr/src/cmd/zpool/Makefile b/usr/src/cmd/zpool/Makefile index 4b7e6600c8..ad2cd76d83 100644 --- a/usr/src/cmd/zpool/Makefile +++ b/usr/src/cmd/zpool/Makefile @@ -27,18 +27,16 @@ PROG= zpool OBJS= zpool_main.o zpool_vdev.o zpool_iter.o zpool_util.o -SRCS= $(OBJS:%.o=%.c) POFILES=$(OBJS:%.o=%.po) POFILE= zpool.po include ../Makefile.cmd +include ../Makefile.cmd.64 include ../Makefile.ctf STATCOMMONDIR = $(SRC)/cmd/stat/common STAT_COMMON_OBJS = timestamp.o -STAT_COMMON_SRCS = $(STAT_COMMON_OBJS:%.o=$(STATCOMMONDIR)/%.c) -SRCS += $(STAT_COMMON_SRCS) LDLIBS += -lzfs -lnvpair -ldevid -lefi -ldiskmgt -luutil -lumem -lzutil \ -lm -lzpool @@ -47,15 +45,10 @@ INCS += -I../../common/zfs -I../../uts/common/fs/zfs -I$(STATCOMMONDIR) INCS += -I../../lib/libzutil/common CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all -CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(INCS) +CPPFLAGS += $(INCS) $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG -# lint complains about unused _umem_* functions -LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2 -LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2 - ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%) .KEEP_STATE: @@ -79,8 +72,6 @@ $(POFILE): $(POFILES) clean: $(RM) $(OBJS) $(STAT_COMMON_OBJS) -lint: lint_SRCS - # Links from /usr/sbin to /sbin $(ROOTUSRSBINLINKS): -$(RM) $@; $(SYMLINK) ../../sbin/$(@F) $@ -- cgit v1.2.3