Mercurial > illumos > git > illumos-joyent
changeset 25645:64f5f6e50ae5
13443 gate build missing some NATIVE_LIBS
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
| author | Andy Fiddaman <omnios@citrus-it.co.uk> |
|---|---|
| date | Mon, 11 Jan 2021 15:29:35 +0000 |
| parents | d564e265fe62 |
| children | 7c19110d764f |
| files | usr/src/cmd/bhyve/Makefile usr/src/tools/smatch/Makefile |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/bhyve/Makefile Mon Jan 11 16:04:05 2021 +0000 +++ b/usr/src/cmd/bhyve/Makefile Mon Jan 11 15:29:35 2021 +0000 @@ -136,6 +136,7 @@ C99MODE= -xc99=%all $(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -luuid -lvmmapi -lz +NATIVE_LIBS += libz.so $(MEVENT_TEST_PROG) := LDLIBS += -lsocket .KEEP_STATE:
--- a/usr/src/tools/smatch/Makefile Mon Jan 11 16:04:05 2021 +0000 +++ b/usr/src/tools/smatch/Makefile Mon Jan 11 15:29:35 2021 +0000 @@ -45,11 +45,14 @@ CFLAGS += -DGCC_BASE='"/no/such/dir"' CFLAGS += -DMULTIARCH_TRIPLET=NULL -LDCHECKS = -Wl,$(ZASSERTDEFLIB) -Wl,$(ZGUIDANCE) -Wl,$(ZFATALWARNINGS) -LDLIBS += -Wl,$(ZLAZYLOAD) -Wl,$(ZDIRECT) -lsqlite3 -lcrypto -lgcc -lm -lc +LDCHECKS = $(ZASSERTDEFLIB) $(ZGUIDANCE) $(ZFATALWARNINGS) +LDLIBS += $(ZLAZYLOAD) $(ZDIRECT) -lsqlite3 -lcrypto -lgcc -lm -lc LDFLAGS = $(MAPFILE.NES:%=-Wl,-M%) LDFLAGS += -L$(NATIVE_ADJUNCT)/lib -R$(NATIVE_ADJUNCT)/lib +NATIVE_LIBS += libsqlite3.so libcrypto.so libm.so libc.so +LDFLAGS += $(NATIVE_LIBS:%=$(ZASSERTDEFLIB)=%) + CPPFLAGS += -nostdinc CPPFLAGS += -Isrc/ CPPFLAGS += -I$(NATIVE_ADJUNCT)/include