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/lib/libzfs_core | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libzfs_core')
| -rw-r--r-- | usr/src/lib/libzfs_core/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/Makefile.com | 5 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/sparcv9/Makefile | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/usr/src/lib/libzfs_core/Makefile b/usr/src/lib/libzfs_core/Makefile index f0711971e5..9782300263 100644 --- a/usr/src/lib/libzfs_core/Makefile +++ b/usr/src/lib/libzfs_core/Makefile @@ -38,14 +38,13 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint MSGFILES = `$(GREP) -l gettext $(HDRDIR)/*.[ch]` POFILE = libzfs_core.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libzfs_core/Makefile.com b/usr/src/lib/libzfs_core/Makefile.com index 5f23a27a1a..5693e9ab0f 100644 --- a/usr/src/lib/libzfs_core/Makefile.com +++ b/usr/src/lib/libzfs_core/Makefile.com @@ -38,7 +38,7 @@ include ../../Makefile.lib # libzfs_core must be installed in the root filesystem for mount(1M) include ../../Makefile.rootfs -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common @@ -48,20 +48,17 @@ INCS += -I../../../common/zfs INCS += -I../../libc/inc CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all LDLIBS += -lc -lnvpair CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \ $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck pics/%.o: ../../../common/zfs/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libzfs_core/amd64/Makefile b/usr/src/lib/libzfs_core/amd64/Makefile index b780a6dba8..14bdb8486d 100644 --- a/usr/src/lib/libzfs_core/amd64/Makefile +++ b/usr/src/lib/libzfs_core/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libzfs_core/i386/Makefile b/usr/src/lib/libzfs_core/i386/Makefile index 4088a1eac0..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/i386/Makefile +++ b/usr/src/lib/libzfs_core/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparc/Makefile b/usr/src/lib/libzfs_core/sparc/Makefile index 4088a1eac0..dc6deda296 100644 --- a/usr/src/lib/libzfs_core/sparc/Makefile +++ b/usr/src/lib/libzfs_core/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libzfs_core/sparcv9/Makefile b/usr/src/lib/libzfs_core/sparcv9/Makefile index fc812ba170..a25e4750b5 100644 --- a/usr/src/lib/libzfs_core/sparcv9/Makefile +++ b/usr/src/lib/libzfs_core/sparcv9/Makefile @@ -29,4 +29,4 @@ include ../../Makefile.lib.64 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) |