diff options
Diffstat (limited to 'usr/src/cmd/bhyve')
| -rw-r--r-- | usr/src/cmd/bhyve/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/rfb.c | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index 554603d4f8..a8c772c7f8 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -83,7 +83,7 @@ OBJS = $(SRCS:.c=.o) CLOBBERFILES = $(ROOTUSRSBINPROG) $(ZHYVE) ZHYVE_DIR = $(ROOT)/usr/lib/brand/bhyve -ZHYVE_PROG = zhyve +ZHYVE_PROG = zhyve ZHYVE = $(ZHYVE_DIR)/$(ZHYVE_PROG) MEVENT_TEST_PROG = mevent_test @@ -109,9 +109,9 @@ CPPFLAGS = -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ # Disable the crypto code until it is wired up CPPFLAGS += -DNO_OPENSSL -LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -luuid -lvmmapi -lz - -zhyve := LDLIBS = -lnvpair +$(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -luuid -lvmmapi -lz +$(ZHYVE_PROG) := LDLIBS += -lnvpair +$(MEVENT_TEST_PROG) := LDLIBS += -lsocket POST_PROCESS += ; $(GENSETDEFS) $@ @@ -124,7 +124,7 @@ $(PROG): $(OBJS) $(POST_PROCESS) $(MEVENT_TEST_PROG): $(MEVENT_TEST_OBJS) - $(LINK.c) -o $@ $(MEVENT_TEST_OBJS) -lsocket + $(LINK.c) -o $@ $(MEVENT_TEST_OBJS) $(LDFLAGS) $(LDLIBS) install: all $(ZHYVE) $(ROOTUSRSBINPROG) $(SUBDIRS) diff --git a/usr/src/cmd/bhyve/rfb.c b/usr/src/cmd/bhyve/rfb.c index d96b45c5da..e8c74766fe 100644 --- a/usr/src/cmd/bhyve/rfb.c +++ b/usr/src/cmd/bhyve/rfb.c @@ -874,15 +874,8 @@ rfb_handle(struct rfb_softc *rc, int cfd) rfb_send_screen(rc, cfd, 1); perror = pthread_create(&tid, NULL, rfb_wr_thr, rc); -#ifdef __FreeBSD__ if (perror == 0) pthread_set_name_np(tid, "rfbout"); -#else - /* - * While pthread_set_name_np() remains a no-op, skip this to avoid - * compiler warnings about an empty if-statement. - */ -#endif /* Now read in client requests. 1st byte identifies type */ for (;;) { |