diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 18:05:04 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 18:05:28 +0000 |
| commit | f777802ad8febfcd01d9ef22a94156ded49981c3 (patch) | |
| tree | 9973a5298a5a8ddef782a95578f74381e96bc7fc | |
| parent | a781ab2efb86e8cf17fab92661c903a5c9910e98 (diff) | |
| download | illumos-joyent-f777802ad8febfcd01d9ef22a94156ded49981c3.tar.gz | |
add ld assert-deflib and guidance to gate build [more build race work]
| -rw-r--r-- | usr/src/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/cmd/svc/seed/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/test/os-tests/tests/uccid/Makefile | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 5b3877596a..566050738b 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -50,9 +50,6 @@ $(SPARC_BLD)psm: stand SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) -FIRST_SUBDIRS= data uts lib -SECOND_SUBDIRS= cmd ucblib ucbcmd psm man test $($(MACH)_SUBDIRS) - HDRSUBDIRS= uts head lib cmd ucbhead # UCB headers are bug-for-bug compatible and not checkable against the header @@ -127,7 +124,7 @@ stage-licenses: install2 install1: mapfiles closedbins sgs -install2: install1 .WAIT $(FIRST_SUBDIRS) .WAIT $(SECOND_SUBDIRS) +install2: install1 .WAIT $(SUBDIRS) _msg: _msgdirs rootdirs FRC @for m in $(MSGSUBDIRS); do \ diff --git a/usr/src/cmd/svc/seed/Makefile b/usr/src/cmd/svc/seed/Makefile index 937362605d..fd68090a1d 100644 --- a/usr/src/cmd/svc/seed/Makefile +++ b/usr/src/cmd/svc/seed/Makefile @@ -115,6 +115,8 @@ 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/test/os-tests/tests/uccid/Makefile b/usr/src/test/os-tests/tests/uccid/Makefile index 55fd96bfd5..9f08a6e5cc 100644 --- a/usr/src/test/os-tests/tests/uccid/Makefile +++ b/usr/src/test/os-tests/tests/uccid/Makefile @@ -78,5 +78,5 @@ $(TESTDIR)/%: % $(POST_PROCESS_O) %: %.o - $(LINK.c) -o $@ $< $(EXTRA_OBJS) + $(LINK.c) -o $@ $< $(EXTRA_OBJS) $(LDLIBS) $(POST_PROCESS) |