diff options
| author | John Levon <john.levon@joyent.com> | 2020-02-17 03:11:01 -0800 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-02-18 09:45:25 -0800 |
| commit | 3e3015ce0eb82be8ac17954eba80f3f24204fcbd (patch) | |
| tree | af614e15d53371fef45c9f1c0ab80c8804ebdaf2 | |
| parent | ced75a9309169d0177775214e3e1780ef5f7cf8a (diff) | |
| download | illumos-joyent-3e3015ce0eb82be8ac17954eba80f3f24204fcbd.tar.gz | |
12311 adjust NATIVE_LIBS in SMF makefiles
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/svc/configd/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/cmd/svc/svccfg/Makefile | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 7b1c8f4da1..e498673e40 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -24,7 +24,7 @@ # # Copyright 2015 RackTop Systems. # -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # MYPROG = svc.configd @@ -78,8 +78,10 @@ SCRIPTFILE = restore_repository ROOTSCRIPTFILE = $(ROOTCMDDIR)/$(SCRIPTFILE) # -# Native variant (used in ../seed) +# Native variant (used in ../seed). We only need to set NATIVE_LIBS if +# $(ADJUNCT_PROTO) is pointing outside of /usr/lib. # +$(NO_ADJUNCT_PROTO)NATIVE_LIBS += libumem.so libc.so $(NATIVE_BUILD)CC = $(NATIVECC) $(NATIVE_BUILD)LD = $(NATIVELD) $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS) diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index cba4e125c9..16312b56f7 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -21,7 +21,7 @@ # # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2018, Joyent, Inc. +# Copyright 2020 Joyent, Inc. # MYPROG = svccfg @@ -92,7 +92,11 @@ 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 +# +# If no adjunct, then we'll already find /usr/lib via LDLIBS below. +# +$(NO_ADJUNCT_PROTO)NATIVE_LIBS += libxml2.so libl.so libumem.so \ + libmd5.so libnvpair.so libc.so LIBSCF = $(SRC)/lib/libscf LIBTECLA = $(SRC)/lib/libtecla # just for the header |