diff options
| author | Toomas Soome <tsoome@me.com> | 2020-01-17 09:49:43 -0800 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-02-05 19:00:00 +0200 |
| commit | 5801b0f01c3c34499a929ed96164a5a68b470945 (patch) | |
| tree | 50e06e6f9eb27ea820f4f4e711c485499aad6e86 /usr/src/cmd/cmd-crypto | |
| parent | 948761701ebc8a0cf820a973780b2fbb931c4390 (diff) | |
| download | illumos-joyent-5801b0f01c3c34499a929ed96164a5a68b470945.tar.gz | |
12217 add ld assert-deflib and guidance to gate build
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/cmd-crypto')
| -rw-r--r-- | usr/src/cmd/cmd-crypto/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-crypto/kmfcfg/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-crypto/tpmadm/Makefile | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/usr/src/cmd/cmd-crypto/Makefile b/usr/src/cmd/cmd-crypto/Makefile index c23513d431..6993d7b0d1 100644 --- a/usr/src/cmd/cmd-crypto/Makefile +++ b/usr/src/cmd/cmd-crypto/Makefile @@ -40,12 +40,11 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint _msg:= TARGET= _msg .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS1) $($(MACH)_SUBDIRS) +all clean clobber _msg: $(SUBDIRS1) $($(MACH)_SUBDIRS) install: $(SUBDIRS1) $(SUBDIRS2) $($(MACH)_SUBDIRS) diff --git a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile index beaac6f8e7..5d026693be 100644 --- a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile +++ b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile @@ -51,6 +51,7 @@ CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I$(KMFDIR)/include -I. LDLIBS += -L$(ROOT)/usr/lib -lkmf -lcryptoutil XMLLIB = -lxml2 +NATIVE_LIBS += libxml2.so .KEEP_STATE: @@ -83,6 +84,4 @@ $(DTDDIR)/%: % clean: $(RM) $(OBJS) -lint : lint_SRCS - include ../../Makefile.targ diff --git a/usr/src/cmd/cmd-crypto/tpmadm/Makefile b/usr/src/cmd/cmd-crypto/tpmadm/Makefile index cfb20a8ea5..a9a1d95aca 100644 --- a/usr/src/cmd/cmd-crypto/tpmadm/Makefile +++ b/usr/src/cmd/cmd-crypto/tpmadm/Makefile @@ -35,8 +35,8 @@ POFILE = $(PROG)_msg.po MSGFILES=$(SRCS:%.c=%.i) CPPFLAGS += -xCC -LINTFLAGS += -XCC -L$(ADJUNCT_PROTO)/usr/lib LDLIBS += -ltspi -luuid +NATIVE_LIBS += libtspi.so CLOBBERFILES = C.ln $(POFILE) $(POFILES) @@ -56,6 +56,4 @@ install : all $(ROOTPROG) clean : $(RM) $(OBJS) -lint : lint_SRCS - include ../../Makefile.targ |