diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/cmd/bhyve | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/cmd/bhyve')
| -rw-r--r-- | usr/src/cmd/bhyve/Makefile | 13 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/test/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/test/Makefile.subdirs | 3 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/test/Makefile.targ | 5 |
4 files changed, 3 insertions, 20 deletions
diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index 34f54f34b8..740cd2679a 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -26,7 +26,6 @@ all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint SRCS = acpi.c \ atkbdc.c \ @@ -136,16 +135,8 @@ SMOFF += all_func_returns,leaks,no_if_block CSTD= $(CSTD_GNU99) C99MODE= -xc99=%all -$(PROG) := LDLIBS += \ - -lsocket \ - -lnsl \ - -ldlpi \ - -ldladm \ - -lmd \ - -lsunw_crypto \ - -luuid \ - -lvmmapi \ - -lz +$(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -lsunw_crypto -luuid \ + -lvmmapi -lz $(ZHYVE_PROG) := LDLIBS += -lnvpair $(MEVENT_TEST_PROG) := LDLIBS += -lsocket diff --git a/usr/src/cmd/bhyve/test/Makefile.com b/usr/src/cmd/bhyve/test/Makefile.com index 3367ae50ea..2bd67140f5 100644 --- a/usr/src/cmd/bhyve/test/Makefile.com +++ b/usr/src/cmd/bhyve/test/Makefile.com @@ -22,7 +22,6 @@ include $(SRC)/cmd/Makefile.cmd.64 # CSTD= $(CSTD_GNU99) C99MODE= -xc99=%all -C99LMODE= -Xc99=%all CFLAGS += $(CCVERBOSE) -_gcc=-Wimplicit-function-declaration \ -_gcc=-Wno-parentheses @@ -59,4 +58,3 @@ ROOTOUT = $(OUTFILES:%=$(ROOTTSTDIR)/%) ROOTTESTS = $(ROOTTSTEXES) $(ROOTTSTSH) $(ROOTOUT) FILEMODE = 0555 LDLIBS = $(LDLIBS.cmd) -LINTEXE = $(EXETESTS:%.exe=%.exe.ln) diff --git a/usr/src/cmd/bhyve/test/Makefile.subdirs b/usr/src/cmd/bhyve/test/Makefile.subdirs index 45f0aa67fa..ff7d6c91cb 100644 --- a/usr/src/cmd/bhyve/test/Makefile.subdirs +++ b/usr/src/cmd/bhyve/test/Makefile.subdirs @@ -19,9 +19,8 @@ all := TARGET += all clean := TARGET += clean clobber := TARGET += clobber install := TARGET += install -lint := TARGET += lint -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/bhyve/test/Makefile.targ b/usr/src/cmd/bhyve/test/Makefile.targ index e3ec55cfdb..13d28a0630 100644 --- a/usr/src/cmd/bhyve/test/Makefile.targ +++ b/usr/src/cmd/bhyve/test/Makefile.targ @@ -43,11 +43,6 @@ $(ROOTTSTDIR)/%.exe: %.exe $(ROOTTSTDIR) all: install -%.exe.ln: %.c $(SUPOBJS) - $(LINT.c) $< $(LDLIBS) - -lint: $(LINTEXE) - clean: -$(RM) *.o $(CLEANFILES) |