diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 12:30:01 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 12:30:01 +0000 |
| commit | e7a46c7be17beafa9e5973e0aa2e5a18d38db82f (patch) | |
| tree | 9eda57d83b8023583d3473bfd34b9238b1287819 /usr/src/cmd/svc | |
| parent | 0efa232c593d8fe393b56fb1ff4dda751660b3b3 (diff) | |
| parent | 5801b0f01c3c34499a929ed96164a5a68b470945 (diff) | |
| download | illumos-joyent-e7a46c7be17beafa9e5973e0aa2e5a18d38db82f.tar.gz | |
[illumos-gate merge]
commit 5801b0f01c3c34499a929ed96164a5a68b470945
12217 add ld assert-deflib and guidance to gate build
commit 948761701ebc8a0cf820a973780b2fbb931c4390
12262 Suboptimal vmem hash table slows down boot
commit cdd7a662d2c0914e93e1daa44cebae7003c99777
12254 python changes have broken the zfs test suite
Conflicts:
usr/src/lib/libzonecfg/Makefile.com
usr/src/lib/libc/sparcv9/Makefile.com
usr/src/lib/libc/sparc/Makefile.com
usr/src/lib/libc/i386/Makefile.com
usr/src/lib/libc/amd64/Makefile
usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
usr/src/lib/Makefile
usr/src/cmd/sendmail/src/Makefile
usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/configd/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/svc/svccfg/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
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 \ |