diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 21:02:11 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 21:02:11 +0000 |
| commit | 75fc8ff7f6ab07ed2476a074a7bbaba7ef1f06ee (patch) | |
| tree | fdcd9fb65d0a501a4315e1058159174142b50428 /usr/src/cmd/svc | |
| parent | f777802ad8febfcd01d9ef22a94156ded49981c3 (diff) | |
| download | illumos-joyent-75fc8ff7f6ab07ed2476a074a7bbaba7ef1f06ee.tar.gz | |
12217 add ld assert-deflib and guidance to gate build [still fighting build race failure]
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/configd/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/cmd/svc/seed/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/svc/svccfg/Makefile | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 7b1c8f4da1..6312700741 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -80,6 +80,7 @@ ROOTSCRIPTFILE = $(ROOTCMDDIR)/$(SCRIPTFILE) # # Native variant (used in ../seed) # +$(NATIVE_BUILD)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/seed/Makefile b/usr/src/cmd/svc/seed/Makefile index fd68090a1d..937362605d 100644 --- a/usr/src/cmd/svc/seed/Makefile +++ b/usr/src/cmd/svc/seed/Makefile @@ -115,8 +115,6 @@ SEEDFILEMODE = 0444 # seeds are not intended for editing, but may CONFIGD = ../configd/svc.configd-native SVCCFG = ../svccfg/svccfg-native -NATIVE_LIBS += libc.so libumem.so - .KEEP_STATE: all: global.db nonglobal.db miniroot.db diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index cba4e125c9..02e54e039c 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -103,6 +103,7 @@ lint := SVCCFG_EXTRA_LIBS = -lscf -ll -luutil -lumem -lmd5 -lnvpair LDLIBS += $(SVCCFG_EXTRA_LIBS) +$(NATIVE_BUILD)NATIVE_LIBS += libl.so libumem.so libmd5.so libnvpair.so libc.so $(NATIVE_BUILD)CC = $(NATIVECC) $(NATIVE_BUILD)LD = $(NATIVELD) $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS) |