diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2021-01-11 15:29:35 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2021-01-12 13:38:22 +0000 |
| commit | 2cbc828d66d6088914f685ae0e77169ecc9fc7f9 (patch) | |
| tree | 68659957f1463d6e337e10334a6e8c1c0e66b69c | |
| parent | bac90afdc3c952be2a041bb1b669ac56cef7d145 (diff) | |
| download | illumos-joyent-2cbc828d66d6088914f685ae0e77169ecc9fc7f9.tar.gz | |
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>
| -rw-r--r-- | usr/src/cmd/bhyve/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/tools/smatch/Makefile | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index 7126fdda17..599494871c 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -136,6 +136,7 @@ CSTD= $(CSTD_GNU99) C99MODE= -xc99=%all $(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -luuid -lvmmapi -lz +NATIVE_LIBS += libz.so $(MEVENT_TEST_PROG) := LDLIBS += -lsocket .KEEP_STATE: diff --git a/usr/src/tools/smatch/Makefile b/usr/src/tools/smatch/Makefile index db1bd68b8f..ef67695404 100644 --- a/usr/src/tools/smatch/Makefile +++ b/usr/src/tools/smatch/Makefile @@ -45,11 +45,14 @@ CFLAGS += -DSMATCHDATADIR='"$(SMATCHDATADIR)"' 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 |