From 5801b0f01c3c34499a929ed96164a5a68b470945 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Fri, 17 Jan 2020 09:49:43 -0800 Subject: 12217 add ld assert-deflib and guidance to gate build Reviewed by: Robert Mustacchi Reviewed by: Gergő Mihály Doma Approved by: Dan McDonald MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- usr/src/cmd/svc/configd/Makefile | 2 +- usr/src/cmd/svc/svccfg/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'usr/src/cmd/svc') diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index b90b64e302..7b1c8f4da1 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -85,7 +85,7 @@ $(NATIVE_BUILD)LD = $(NATIVELD) $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS) $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD -$(NATIVE_BUILD)LDFLAGS = +$(NATIVE_BUILD)LDFLAGS = $(BDIRECT) $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \ -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS) diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index 2e32677477..cba4e125c9 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -92,6 +92,7 @@ CLOBBERFILES += svccfg_lex.c svccfg_grammar.c svccfg_grammar.h \ SVCCFG_EXTRA_LIBS = -lxml2 -lscf -ll -luutil -lumem -lmd5 -lnvpair $(NOT_NATIVE)SVCCFG_EXTRA_LIBS += -ltecla +NATIVE_LIBS += libxml2.so LIBSCF = $(SRC)/lib/libscf LIBTECLA = $(SRC)/lib/libtecla # just for the header @@ -111,7 +112,7 @@ $(NATIVE_BUILD)CPPFLAGS = \ -I$(LIBSCF)/inc \ -I$(LIBTECLA) \ -I$(LIBUUTIL)/common -$(NATIVE_BUILD)LDFLAGS = +$(NATIVE_BUILD)LDFLAGS = $(BDIRECT) $(NATIVE_BUILD)LDLIBS = \ -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \ -L$(LIBSCF)/native -R $(LIBSCF)/native \ -- cgit v1.2.3