diff options
| author | Toomas Soome <tsoome@me.com> | 2020-02-18 09:37:16 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-11-23 19:32:16 +0200 |
| commit | 18425b359c7d1e5f7f63fae3ca5245407223a45b (patch) | |
| tree | 095ab0a485973af42a6062b756fbf95fbeb4961a | |
| parent | a39905c1c6671c3f44d52e31393ee7cdda7b4f12 (diff) | |
| download | illumos-joyent-18425b359c7d1e5f7f63fae3ca5245407223a45b.tar.gz | |
12318 build zpool command as 64-bit binary
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Robert Mustacchi <rm@fingolfin.org>
| -rw-r--r-- | usr/src/cmd/zpool/Makefile | 13 |
1 files 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) $@ |