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/sgs | |
| 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/sgs')
| -rw-r--r-- | usr/src/cmd/sgs/elfdump/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/elfedit/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/librtld_db/demo/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/link_audit/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/tools/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/tools/Makefile.targ | 3 |
6 files changed, 11 insertions, 2 deletions
diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com index 968c8ae99c..9452ddde81 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.com +++ b/usr/src/cmd/sgs/elfdump/Makefile.com @@ -57,6 +57,8 @@ LDFLAGS += $(VERSREF) $(MAPOPT) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \ $(CONVLIBDIR) -lconv +NATIVE_LDFLAGS = $(LDASSERTS) $(BDIRECT) $(ZASSERTDEFLIB)=libc.so + CERRWARN += $(CNOWARN_UNINIT) # not linted diff --git a/usr/src/cmd/sgs/elfedit/Makefile.com b/usr/src/cmd/sgs/elfedit/Makefile.com index e218130693..4f35ce2513 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.com +++ b/usr/src/cmd/sgs/elfedit/Makefile.com @@ -51,6 +51,7 @@ LLDFLAGS64 = $(VAR_ELFEDIT_LLDFLAGS64) LDFLAGS += $(VERSREF) -M$(MAPFILE) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \ $(CONVLIBDIR) -lconv -ltecla +NATIVE_LIBS += libtecla.so CERRWARN += -_gcc=-Wno-switch CERRWARN += $(CNOWARN_UNINIT) diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com b/usr/src/cmd/sgs/librtld_db/demo/Makefile.com index 391c1a30cb..6bb248ced9 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/demo/Makefile.com @@ -53,7 +53,8 @@ MV = mv .PARALLEL: $(OBJS) CPPFLAGS= -I../common -I. $(CPPFLAGS.master) -LDLIBS += -lrtld_db -lelf -ll -ly +LDLIBS += $(BDIRECT) $(ZLAZYLOAD) -lrtld_db -lelf -ll -ly +NATIVE_LIBS += libelf.so liby.so libl.so CLEANFILES += $(BLTSRC) $(BLTHDR) simp libsub.so.1 diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com index 1d122e8f8f..39e7dfb3ca 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile.com +++ b/usr/src/cmd/sgs/link_audit/Makefile.com @@ -88,6 +88,8 @@ $(WHOLIB):= MAPFILES = ../common/mapfile-vers-who $(SYMBINDREP):= MAPFILES = ../common/mapfile-vers-symbindrep $(BINDLIB):= MAPFILES = ../common/mapfile-vers-bindings +$(ONPROGS):= LDFLAGS += $(LDLIBS.cmd) $(BDIRECT) + $(ROOTCCSLIB) := DIRMODE = 755 CPPFLAGS += -D_REENTRANT diff --git a/usr/src/cmd/sgs/tools/Makefile.com b/usr/src/cmd/sgs/tools/Makefile.com index be05c9f0a3..634fec820a 100644 --- a/usr/src/cmd/sgs/tools/Makefile.com +++ b/usr/src/cmd/sgs/tools/Makefile.com @@ -41,6 +41,8 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/sgs/Makefile.com OBJECTS= piglatin.o +NATIVECC_CFLAGS = -O +NATIVE_LDFLAGS = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) NATIVE= $(OBJECTS:%.o=%) SRCS= $(OBJECTS:%.o=../common/%.c) diff --git a/usr/src/cmd/sgs/tools/Makefile.targ b/usr/src/cmd/sgs/tools/Makefile.targ index 5d37f9bb65..76e0f3da44 100644 --- a/usr/src/cmd/sgs/tools/Makefile.targ +++ b/usr/src/cmd/sgs/tools/Makefile.targ @@ -34,7 +34,8 @@ $(ROOTDIR)/lib/%: % $(INS.file) piglatin: ../common/piglatin.c - $(NATIVECC) $(NATIVE_CFLAGS) -o $@ ../common/piglatin.c + $(NATIVECC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) -o $@ \ + ../common/piglatin.c %: %.o $(LINK.c) -o $@ $< $(LDLIBS) |