diff options
| -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 |