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/libds | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libds')
| -rw-r--r-- | usr/src/lib/libds/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/lib/libds/Makefile.com | 10 | ||||
| -rw-r--r-- | usr/src/lib/libds/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libds/sparcv9/Makefile | 2 |
4 files changed, 6 insertions, 15 deletions
diff --git a/usr/src/lib/libds/Makefile b/usr/src/lib/libds/Makefile index 059b9076c4..6a5e748f32 100644 --- a/usr/src/lib/libds/Makefile +++ b/usr/src/lib/libds/Makefile @@ -31,24 +31,23 @@ HDRDIR = common ROOTHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) check: $(CHECKHDRS) install: all .WAIT $(SUBDIRS) -install_h: $(ROOTHDRS) +install_h: $(ROOTHDRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libds/Makefile.com b/usr/src/lib/libds/Makefile.com index fe2821b52d..6c56a34ed3 100644 --- a/usr/src/lib/libds/Makefile.com +++ b/usr/src/lib/libds/Makefile.com @@ -32,7 +32,7 @@ OBJECTS = $(LIBSRCS:%.c=%.o) include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common SRCS = $(LIBSRCS:%.c=$(SRCDIR)/%.c) @@ -43,19 +43,11 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) LDLIBS += -lsysevent -lnvpair -lc -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(LINTSRC:%=$(SRCDIR)/%) -$(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \ - -I$(ROOT)/usr/platform/sun4v/include .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck pics/%.o: $(SRCDIR)/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libds/sparc/Makefile b/usr/src/lib/libds/sparc/Makefile index ea09428ea0..ff785b8fef 100644 --- a/usr/src/lib/libds/sparc/Makefile +++ b/usr/src/lib/libds/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libds/sparcv9/Makefile b/usr/src/lib/libds/sparcv9/Makefile index 40e4cef06c..a378005193 100644 --- a/usr/src/lib/libds/sparcv9/Makefile +++ b/usr/src/lib/libds/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) |